okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/ciderapp/Cider into develop

Browse source
This commit is contained in:
booploops 2022-02-11 19:46:19 -08:00
commit 6b5cc68f6a
1 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/main/plugins/menubar.ts
View file

@ -14,7 +14,7 @@ export default class Thumbar {
public name: string = 'Menubar Plugin'; public name: string = 'Menubar Plugin';
public description: string = 'Creates the menubar'; public description: string = 'Creates the menubar';
public version: string = '1.0.0'; public version: string = '1.0.0';
public author: string = 'Core / Quack'; public author: string = 'Core / Quacksire';
/** /**
* Thumbnail Toolbar Assets * Thumbnail Toolbar Assets
@ -38,7 +38,16 @@ export default class Thumbar {
{ {
label: app.getName(), label: app.getName(),
submenu: [ submenu: [
{ role: 'about' }, {
label: 'About',
click: () => this._win.webContents.executeJavaScript(`app.appRoute('about')`)
},
{ type: 'separator' },
{
label: 'Settings',
accelerator: 'CommandOrControl+,',
click: () => this._win.webContents.executeJavaScript(`app.appRoute('settings')`)
},
{ type: 'separator' }, { type: 'separator' },
{ role: 'services' }, { role: 'services' },
{ type: 'separator' }, { type: 'separator' },
@ -71,11 +80,20 @@ export default class Thumbar {
...(this.isMac ? [ ...(this.isMac ? [
{type: 'separator'}, {type: 'separator'},
{role: 'front'}, {role: 'front'},
{type: 'separator'},
{role: 'window'}
] : [ ] : [
{role: 'close'} {role: 'close'}
]), ]),
{
label: 'Edit',
submenu: [
{ role: 'undo' },
{ role: 'redo' },
{ type: 'separator' },
{ role: 'cut' },
{ role: 'copy' },
{ role: 'paste' },
]
},
{type: 'separator'}, {type: 'separator'},
{ {
label: 'Web Remote', label: 'Web Remote',
@ -88,11 +106,7 @@ export default class Thumbar {
accelerator: 'CommandOrControl+Shift+A', accelerator: 'CommandOrControl+Shift+A',
click: () => this._win.webContents.executeJavaScript(`app.modals.audioSettings = true`) click: () => this._win.webContents.executeJavaScript(`app.modals.audioSettings = true`)
}, },
{
label: 'Settings',
accelerator: 'CommandOrControl+,',
click: () => this._win.webContents.executeJavaScript(`app.appRoute('settings')`)
}
] ]
}, },
{ {
@ -151,10 +165,6 @@ export default class Thumbar {
label: 'GitHub Wiki', label: 'GitHub Wiki',
click: () => shell.openExternal("https://github.com/ciderapp/Cider/wiki/Troubleshooting").catch(console.error) click: () => shell.openExternal("https://github.com/ciderapp/Cider/wiki/Troubleshooting").catch(console.error)
}, },
{
label: 'About',
click: () => this._win.webContents.executeJavaScript(`app.appRoute('about')`)
},
{type: 'separator'}, {type: 'separator'},
{ {
label: 'Report a...', label: 'Report a...',