From 5f07c8309fa5047bdb9853435819796aee063090 Mon Sep 17 00:00:00 2001 From: child_duckling <19170969+quacksire@users.noreply.github.com> Date: Mon, 16 May 2022 22:36:32 -0700 Subject: [PATCH 1/4] who tf checked this? Apple's HDG will kill us --- src/main/base/store.ts | 2 +- src/main/plugins/menubar.ts | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/main/base/store.ts b/src/main/base/store.ts index 0edf8b67..d076924b 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -101,7 +101,7 @@ export class Store { ], "settings": [ "CommandOrControl", // Who the hell uses a different key for this? Fucking Option? - "S" + "," ], "openDeveloperTools": [ "CommandOrControl", diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts index 76a0e52b..f0f7aad3 100644 --- a/src/main/plugins/menubar.ts +++ b/src/main/plugins/menubar.ts @@ -22,25 +22,21 @@ export default class Thumbar { { label: app.getName(), submenu: [ + { + label: `${utils.getLocale(utils.getStoreValue('general.language'), 'term.about')} ${app.getName()}`, + click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('about')`) + }, + {type: 'separator'}, { label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.toggleprivate'), accelerator: utils.getStoreValue("general.keybindings.togglePrivateSession").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.cfg.general.privateEnabled = !app.cfg.general.privateEnabled`) }, - {type: 'separator'}, { label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.settings'), accelerator: utils.getStoreValue("general.keybindings.settings").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('settings')`), }, - ...(this.isMac ? [ - {type: 'separator'}, - {role: 'services'}, - {type: 'separator'}, - {role: 'hide'}, - {role: 'hideOthers'}, - {role: 'unhide'}, - ]: [ {type: 'separator'}, { label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.about'), @@ -48,10 +44,8 @@ export default class Thumbar { }, {type: 'separator'}, {role: 'quit', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.quit')}, - ]), - ], + ] }, - { label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.view'), submenu: [ From baaf6234a0e1353904209398ee9b12060c1617a3 Mon Sep 17 00:00:00 2001 From: yazninja <71800112+yazninja@users.noreply.github.com> Date: Tue, 17 May 2022 13:50:16 +0800 Subject: [PATCH 2/4] electron 18.2.3 --- winget.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winget.json b/winget.json index b184fd63..ea0ae1ae 100644 --- a/winget.json +++ b/winget.json @@ -1,7 +1,7 @@ { - "electronVersion": "18.2.0", + "electronVersion": "18.2.3", "electronDownload": { - "version": "18.2.0+wvcus", + "version": "18.2.3+wvcus", "mirror": "https://github.com/castlabs/electron-releases/releases/download/v" }, "appId": "cider", From 19c882878ccad148bd356e4f8816cfa1001e0afd Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Tue, 17 May 2022 12:44:03 +0100 Subject: [PATCH 3/4] test --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f6cfbb0b..46c45835 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +test

Banner
A new cross-platform Apple Music experience based on Electron and Vue.js written from scratch with performance in mind. 🚀 From b5e68114eb8c79d5b2bd5a0ca8b37be2243c1be1 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Tue, 17 May 2022 12:50:03 +0100 Subject: [PATCH 4/4] no --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 46c45835..f6cfbb0b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ -test

Banner
A new cross-platform Apple Music experience based on Electron and Vue.js written from scratch with performance in mind. 🚀