Merge branch 'main' into enhancement/lastfm

This commit is contained in:
Core 2022-06-22 23:37:58 +01:00
commit 7e6f3bd17e
No known key found for this signature in database
GPG key ID: FE9BF1B547F8F3C6
29 changed files with 1348 additions and 1103 deletions

View file

@ -332,7 +332,7 @@ export class AppEvents {
{
visible: !visible,
label: this.i18n['action.tray.playpause'],
label: this.i18n['term.playpause'],
click: () => {
utils.getWindow().webContents.executeJavaScript('MusicKitInterop.playPause()')
}
@ -340,7 +340,7 @@ export class AppEvents {
{
visible: !visible,
label: this.i18n['action.tray.next'],
label: this.i18n['term.next'],
click: () => {
utils.getWindow().webContents.executeJavaScript(`MusicKitInterop.next()`)
}
@ -348,7 +348,7 @@ export class AppEvents {
{
visible: !visible,
label: this.i18n['action.tray.previous'],
label: this.i18n['term.previous'],
click: () => {
utils.getWindow().webContents.executeJavaScript(`MusicKitInterop.previous()`)
}
@ -369,7 +369,7 @@ export class AppEvents {
}
},
{
label: this.i18n['action.tray.quit'],
label: this.i18n['term.quit'],
click: () => {
app.quit()
}

View file

@ -1167,6 +1167,10 @@ export class BrowserWindow {
app.quit();
})
ipcMain.handle("quit-app", (_event, _) => {
app.quit();
})
app.on('before-quit', () => {
})

View file

@ -97,6 +97,18 @@ export class Store {
"CommandOrControl", // Who the hell uses a different key for this? Fucking Option?
","
],
"zoomn": [
"Control",
"numadd",
],
"zoomt": [
"Control",
"numsub",
],
"zoomrst": [
"Control",
"num0",
],
"openDeveloperTools": [
"CommandOrControl",
"Shift",
@ -218,7 +230,6 @@ export class Store {
},
"windowControlPosition": 0, // 0 default right
"nativeTitleBar": false,
"uiScale": 1.0,
"windowColor": "#000000",
"customAccentColor": false,
"accentColor": "#fc3c44",
@ -232,10 +243,11 @@ export class Store {
"enable_yt": false,
},
"advanced": {
"AudioContext": false,
"AudioContext": true,
"experiments": [],
"playlistTrackMapping": true,
"ffmpegLocation": ""
"ffmpegLocation": "",
"disableLogging": false
},
"connectUser": {
"auth": null,