From 199dd45b58044aabedc0bd48edd44d38ee5b8675 Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Sat, 14 May 2022 18:00:02 -0300 Subject: [PATCH 01/16] some test --- src/i18n/en_US.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index a1feee42..78ebd213 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -257,6 +257,9 @@ "action.tray.minimize": "Minimize to Tray", "action.tray.quit": "Quit", "action.tray.show": "Show Cider", + "action.tray.playpause": "Play/Pause", + "action.tray.next": "Next", + "action.tray.previous": "Previous", "action.update": "Update", "action.install": "Install", "action.copy": "Copy", From 9d657013e8cbb784abc7d8dc26dda0c75baff046 Mon Sep 17 00:00:00 2001 From: yazninja Date: Wed, 18 May 2022 10:46:38 +0800 Subject: [PATCH 02/16] switch artist and album in queue --- src/renderer/views/components/queue.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/views/components/queue.ejs b/src/renderer/views/components/queue.ejs index 052467cc..597f6b6f 100644 --- a/src/renderer/views/components/queue.ejs +++ b/src/renderer/views/components/queue.ejs @@ -31,7 +31,7 @@
{{ queueItem.item.attributes.name }}
-
{{ queueItem.item.attributes.albumName }} — {{ queueItem.item.attributes.artistName }}
+
{{ queueItem.item.attributes.artistName }} — {{ queueItem.item.attributes.albumName }}
From 52c1f22f982c1eae4e9b202f569a10bd582196b8 Mon Sep 17 00:00:00 2001 From: yazninja Date: Wed, 18 May 2022 11:52:18 +0800 Subject: [PATCH 03/16] word wrap lyrics --- src/renderer/style.less | 1 + 1 file changed, 1 insertion(+) diff --git a/src/renderer/style.less b/src/renderer/style.less index 6248ded5..4aea6127 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -1605,6 +1605,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { margin: 10px; margin-left: 5%; margin-right: 0px; + overflow-wrap: break-word; } .lyric-line.active .verse { From d453d5c3827b84695ede287608a541fb67d74322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=A5=E5=8F=A1?= <46503943+jay900604@users.noreply.github.com> Date: Wed, 18 May 2022 13:42:36 +0800 Subject: [PATCH 04/16] Update zh_TW.json Update TW language. --- src/i18n/zh_TW.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/i18n/zh_TW.json b/src/i18n/zh_TW.json index ba0f64ef..39230026 100644 --- a/src/i18n/zh_TW.json +++ b/src/i18n/zh_TW.json @@ -233,6 +233,12 @@ "settings.option.general.customizeSidebar": "自訂側邊欄的功能", "settings.option.general.customizeSidebar.customize": "自訂", "settings.option.general.keybindings": "快捷操作鍵", + "settings.option.general.keybindings.pressCombination" : "按下兩個按鍵來更新操作綁定。" , + "settings.option.general.keybindings.pressEscape" : "按 Esc 鍵返回。" , + "settings.notyf.general.keybindings.update.success" : "快捷鍵更新成功" , + "settings.prompt.general.keybindings.update.success" : "快捷鍵已更新，請按「OK」重新啟動 Cider 軟體。" , + "settings.option.general.themeUpdateNotification": "自動檢查主題更新", + "settings.option.general.showLovedTracksInline": "顯示點擊喜愛的歌曲", "settings.option.general.keybindings.open": "開啟", "settings.notyf.updateCider.update-not-available": "沒有可用的更新", "settings.notyf.updateCider.update-downloaded": "更新已成功下載，重啟後進行更新", @@ -310,13 +316,13 @@ "settings.header.visual.hardwareAcceleration.webGPU": "WebGPU", "settings.header.visual.theme": "主題", "settings.option.visual.theme.github.download": "從 GitHub 網址安裝", - "settings.option.visual.theme.github.openfolder": "打開主題存放位置", + "settings.option.visual.theme.github.openfolder": "開啟主題存放位置", "settings.option.visual.theme.github.explore": "探索 GitHub 上的主題", "settings.prompt.visual.theme.github.URL": "輸入你要安裝的主題網址", "settings.option.visual.theme.manageStyles": "管理主題", "settings.option.visual.theme.uninstall": "移除", "settings.option.visual.theme.viewInfo": "查看資訊", - "settings.option.visual.theme.github.available": "可用", + "settings.option.visual.theme.github.available": "可使用", "settings.option.visual.theme.github.applied": "已套用", "settings.notyf.visual.theme.install.success": "主題成功安裝", "settings.notyf.visual.theme.install.error": "主題安裝失敗", @@ -354,6 +360,7 @@ "settings.option.connectivity.discordRPC.clientName": "應用程式名稱", "settings.option.connectivity.discordRPC.clearOnPause": "暫停時清除 Discord 動態", "settings.option.connectivity.discordRPC.hideButtons": "隱藏 Discord 動態上的按鈕", + "settings.option.connectivity.discordRPC.hideTimestamp": "隱藏 Discord 動態的時間戳", "settings.option.connectivity.discordRPC.detailsFormat": "詳細資訊格式", "settings.option.connectivity.discordRPC.stateFormat": "狀態格式", "settings.option.connectivity.lastfmScrobble": "Last.FM 音樂記錄", From 12be8f0ad31f218ca191eadb32594f5a0a3bb575 Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Wed, 18 May 2022 02:52:24 -0300 Subject: [PATCH 05/16] about 2 times --- src/main/plugins/menubar.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts index f0f7aad3..885f8ab5 100644 --- a/src/main/plugins/menubar.ts +++ b/src/main/plugins/menubar.ts @@ -38,11 +38,6 @@ export default class Thumbar { click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('settings')`), }, {type: 'separator'}, - { - label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.about'), - click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('about')`) - }, - {type: 'separator'}, {role: 'quit', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.quit')}, ] }, From 992ec792cb52d22bfc4078cdbe3c3418dd9d6680 Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Wed, 18 May 2022 12:54:41 -0300 Subject: [PATCH 06/16] SysTray Changes --- src/i18n/en_US.json | 1 + src/main/base/app.ts | 50 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index b3553bde..001e15cf 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -260,6 +260,7 @@ "action.tray.playpause": "Play/Pause", "action.tray.next": "Next", "action.tray.previous": "Previous", + "action.tray.listento": "Listen To:", "action.update": "Update", "action.install": "Install", "action.copy": "Copy", diff --git a/src/main/base/app.ts b/src/main/base/app.ts index 9ae6b6a9..17c55e01 100644 --- a/src/main/base/app.ts +++ b/src/main/base/app.ts @@ -299,6 +299,56 @@ export class AppEvents { this.i18n = utils.getLocale(utils.getStoreValue('general.language')) const menu = Menu.buildFromTemplate([ + + { + label: app.getName(), + enabled: false, + icon: path.join(__dirname, `../../resources/icons/icon.png`), + }, + + {type: 'separator'}, + + /* For now only idea i dont know if posible to implement + { + label: this.i18n['action.tray.listento'], + enabled: false, + }, + + { + visible: visible, + label: 'track info', + enabled: false, + }, + + {type: 'separator'}, + */ + + { + visible: (visible === false), + label: this.i18n['action.tray.playpause'], + click: () => { + utils.getWindow().webContents.executeJavaScript('MusicKitInterop.playPause()') + } + }, + + { + visible: (visible === false), + label: this.i18n['action.tray.next'], + click: () => { + utils.getWindow().webContents.executeJavaScript(`MusicKitInterop.next()`) + } + }, + + { + visible: (visible === false), + label: this.i18n['action.tray.previous'], + click: () => { + utils.getWindow().webContents.executeJavaScript(`MusicKitInterop.previous()`) + } + }, + + {type: 'separator'}, + { label: (visible ? this.i18n['action.tray.minimize'] : `${this.i18n['action.tray.show']}`), click: () => { From f836a3bda15727c28f51b6234abcea3171fafacb Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Wed, 18 May 2022 14:17:17 -0300 Subject: [PATCH 07/16] Documentation and menubar REVERT --- src/i18n/README.md | 11 +++++++++-- src/i18n/source/en_US.json | 3 +++ src/main/plugins/menubar.ts | 5 +++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/i18n/README.md b/src/i18n/README.md index 28375d07..2f4bfba9 100644 --- a/src/i18n/README.md +++ b/src/i18n/README.md @@ -375,7 +375,7 @@ Update 12/05/2022 22:50 UTC * `settings.option.audio.dbspl.display`: Added for `en_US`, * `settings.option.audio.dbspl.description`: Added for `en_US`, * `settings.option.audio.dbfs.calibration`: Added for `en_US`, -* `settings.option.audio.dbfs.description`: Added for `en_US` +* `settings.option.audio.dbfs.description`: Added for `en_US`, Update 14/05/2022 02:00 UTC @@ -386,4 +386,11 @@ Update 14/05/2022 02:00 UTC * `settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.E68_2`: Added for `en_US`, * `settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.E168_1`: Added for `en_US`, * `settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.Z3600`: Added for `en_US`, -* `settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.Z8500`: Added for `en_US` +* `settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.Z8500`: Added for `en_US`, + + +Update 18/05/2022 14:20 UTC + +* `action.tray.playpause`: Added for `en_US`, +* `action.tray.next`: Added for `en_US`, +* `action.tray.previous`: Added for `en_US`, \ No newline at end of file diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json index 2ee5fc57..b1eabc49 100644 --- a/src/i18n/source/en_US.json +++ b/src/i18n/source/en_US.json @@ -257,6 +257,9 @@ "action.tray.minimize": "Minimize to Tray", "action.tray.quit": "Quit", "action.tray.show": "Show Cider", + "action.tray.playpause": "Play/Pause", + "action.tray.next": "Next", + "action.tray.previous": "Previous", "action.update": "Update", "action.install": "Install", "action.copy": "Copy", diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts index 885f8ab5..f0f7aad3 100644 --- a/src/main/plugins/menubar.ts +++ b/src/main/plugins/menubar.ts @@ -38,6 +38,11 @@ export default class Thumbar { click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('settings')`), }, {type: 'separator'}, + { + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.about'), + click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('about')`) + }, + {type: 'separator'}, {role: 'quit', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.quit')}, ] }, From 4c6aa9ecaf01388041a0ff04ea742d90a45784fe Mon Sep 17 00:00:00 2001 From: Quacksire <19170969+quacksire@users.noreply.github.com> Date: Wed, 18 May 2022 12:16:21 -0700 Subject: [PATCH 08/16] Update bug_report.yaml --- .github/ISSUE_TEMPLATE/bug_report.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index d18e0e23..5160afba 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -35,7 +35,7 @@ body: - **OS**: Ubuntu 20.04 - **App Version** and/or **Commit ID**: 1.0.0 c9d43be - To find app version, go to the About page. + To find app version, Cider Menu -> About value: | - OS: - App Version and/or Commit ID: From 4ea354fcdfbee7355e04a0a940b6f71a7207c686 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Thu, 19 May 2022 10:43:42 +0100 Subject: [PATCH 09/16] for the sake of anyone who uses macos, DO NOT CHANGE THIS --- src/main/plugins/menubar.ts | 37 +++++++++++++++++++++++-------------- src/main/plugins/thumbar.ts | 2 +- tsconfig.json | 2 +- 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts index f0f7aad3..6408be1a 100644 --- a/src/main/plugins/menubar.ts +++ b/src/main/plugins/menubar.ts @@ -35,20 +35,33 @@ export default class Thumbar { { 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')`), + click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('settings')`) }, - {type: 'separator'}, - { - label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.about'), - click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('about')`) - }, - {type: 'separator'}, - {role: 'quit', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.quit')}, + ...(this.isMac ? [ + {type: 'separator'}, + {role: 'services'}, + {type: 'separator'}, + {role: 'hide'}, + {role: 'hideOthers'}, + {role: 'unhide'}, + {type: 'separator'}, + {role: 'quit'} + ] : []), ] }, { label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.view'), submenu: [ + {role: 'reload'}, + {role: 'forceReload'}, + {role: 'toggleDevTools'}, + {type: 'separator'}, + {role: 'resetZoom'}, + {role: 'zoomIn'}, + {role: 'zoomOut'}, + {type: 'separator'}, + {role: 'togglefullscreen'}, + {type: 'separator'}, { label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.search'), accelerator: utils.getStoreValue("general.keybindings.search").join('+'), @@ -85,13 +98,9 @@ export default class Thumbar { label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.artists'), accelerator: utils.getStoreValue("general.keybindings.artists").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('library-artists')`) - }, - {type: 'separator'}, - ...(this.isMac ? [ - ]: []), - ], + }, + ] }, - { label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.window'), submenu: [ diff --git a/src/main/plugins/thumbar.ts b/src/main/plugins/thumbar.ts index 5f504878..99470e32 100644 --- a/src/main/plugins/thumbar.ts +++ b/src/main/plugins/thumbar.ts @@ -93,7 +93,7 @@ export default class Thumbar { /** * Runs on plugin load (Currently run on application start) */ - constructor(utils: { getApp: () => any; }) { + constructor(a: { getApp: () => any; }) { this._app = utils.getApp(); console.debug(`[Plugin][${this.name}] Loading Complete.`); } diff --git a/tsconfig.json b/tsconfig.json index c9eeb6da..a500c11a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,7 @@ { "compilerOptions": { "experimentalDecorators": true, - "target": "esnext", + "target": "es6", "module": "commonjs", "allowJs": true, "noImplicitAny": true, From 474208434d315d5959fee663d767221f3773f311 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Thu, 19 May 2022 11:12:43 +0100 Subject: [PATCH 10/16] Update build-macos.yml --- .github/workflows/build-macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index be849760..a9a2fa0f 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -13,7 +13,7 @@ name: "macOS build" on: push: - branches: [ develop ] + branches: [ main ] paths-ignore: - 'README.md' - 'SECURITY.md' From e4082f25996dce3ad30389aa49e8b686ca2efcfe Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Thu, 19 May 2022 11:40:33 +0100 Subject: [PATCH 11/16] focus the search --- src/main/plugins/menubar.ts | 4 ++-- src/renderer/main/vueapp.js | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts index 6408be1a..5b9f47a1 100644 --- a/src/main/plugins/menubar.ts +++ b/src/main/plugins/menubar.ts @@ -63,9 +63,9 @@ export default class Thumbar { {role: 'togglefullscreen'}, {type: 'separator'}, { - label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.search'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.search'), accelerator: utils.getStoreValue("general.keybindings.search").join('+'), - click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('search')`) + click: () => utils.getWindow().webContents.executeJavaScript('app.focusSearch()') }, {type:'separator'}, { diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index db9954e9..92b1b6c3 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -2165,6 +2165,13 @@ const app = new Vue({ sortArtists() } }, + focusSearch() { + app.appRoute('search') + const search = document.getElementsByClassName("search-input") + if (search.length > 0) { + search[0].focus() + } + }, getSidebarItemClass(page) { if (this.page == page) { return ["active"] From 7e24594be43150426dcc15fb7ff89cd27f292cfa Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Thu, 19 May 2022 23:26:25 +0100 Subject: [PATCH 12/16] this is annoying --- src/main/base/app.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/base/app.ts b/src/main/base/app.ts index 17c55e01..2f8100ec 100644 --- a/src/main/base/app.ts +++ b/src/main/base/app.ts @@ -259,7 +259,6 @@ export class AppEvents { height: 20 }), } - this.tray = new Tray(process.platform === 'win32' ? icons.win32 : (process.platform === 'darwin' ? icons.darwin : icons.linux)) this.tray.setToolTip(app.getName()) this.setTray(false) @@ -298,12 +297,17 @@ export class AppEvents { private setTray(visible: boolean = utils.getWindow().isVisible()) { this.i18n = utils.getLocale(utils.getStoreValue('general.language')) + const ciderIcon = nativeImage.createFromPath(path.join(__dirname, `../../resources/icons/icon.png`)).resize({ + width: 20, + height: 20 + }) + const menu = Menu.buildFromTemplate([ { label: app.getName(), enabled: false, - icon: path.join(__dirname, `../../resources/icons/icon.png`), + icon: ciderIcon, }, {type: 'separator'}, From 7b141669509139459ab875d196e96fa3c162888c Mon Sep 17 00:00:00 2001 From: Nils Hanke Date: Fri, 20 May 2022 00:27:46 +0200 Subject: [PATCH 13/16] Add mpris slot for snap package --- package.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package.json b/package.json index c79b2acb..f972008b 100644 --- a/package.json +++ b/package.json @@ -178,6 +178,15 @@ "isRelocatable": false, "overwriteAction": "upgrade" }, + "snap": { + "slots": [ + { + "mpris": { + "interface": "mpris" + } + } + ] + }, "dmg": { "background": "./resources/bg.png", "icon": "resources/icons/icon.ico" From 589656558b0a145a444b3e6729db19ed4b204f2c Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Thu, 19 May 2022 23:32:18 +0100 Subject: [PATCH 14/16] version updater script --- resources/version.sh | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100755 resources/version.sh diff --git a/resources/version.sh b/resources/version.sh new file mode 100755 index 00000000..5daefd13 --- /dev/null +++ b/resources/version.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +LATESTSHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep sha | cut -d '"' -f 4 | sed 's/v//' | xargs) +COMMITSINCESTABLE=$(git rev-list $LATESTSHA..HEAD --count) +VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1) +echo +NEWVERSION=${VERSION/-/.}.$COMMITSINCESTABLE +npm version $NEWVERSION \ No newline at end of file From fad3edb76445f4aa3a8b6b788845e8b147a9c638 Mon Sep 17 00:00:00 2001 From: Monochromish <79590499+Monochromish@users.noreply.github.com> Date: Fri, 20 May 2022 09:06:46 +1000 Subject: [PATCH 15/16] Add hover effect on queue item. (#1053) --- src/renderer/less/elements.css | 3 +++ src/renderer/less/elements.less | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/src/renderer/less/elements.css b/src/renderer/less/elements.css index 0c54721e..29990353 100644 --- a/src/renderer/less/elements.css +++ b/src/renderer/less/elements.css @@ -254,6 +254,9 @@ height: 32px; flex: 0 0 auto; } +.cd-queue-item:hover { + background: var(--selected); +} .cd-queue-item.selected { background: var(--selected); } diff --git a/src/renderer/less/elements.less b/src/renderer/less/elements.less index 10939150..41b79d9f 100644 --- a/src/renderer/less/elements.less +++ b/src/renderer/less/elements.less @@ -306,6 +306,10 @@ flex: 0 0 auto; } + &:hover { + background: var(--selected); + } + &.selected { background: var(--selected); } From 92a70f086c79ac6a03c988e539c448e264f921f6 Mon Sep 17 00:00:00 2001 From: Gabriel Davila <56521591+mefsaal@users.noreply.github.com> Date: Thu, 19 May 2022 20:52:34 -0300 Subject: [PATCH 16/16] Fix Tray icon (#1059) --- src/main/base/app.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/base/app.ts b/src/main/base/app.ts index 2f8100ec..dad4d4a9 100644 --- a/src/main/base/app.ts +++ b/src/main/base/app.ts @@ -298,8 +298,8 @@ export class AppEvents { this.i18n = utils.getLocale(utils.getStoreValue('general.language')) const ciderIcon = nativeImage.createFromPath(path.join(__dirname, `../../resources/icons/icon.png`)).resize({ - width: 20, - height: 20 + width: 24, + height: 24 }) const menu = Menu.buildFromTemplate([ @@ -308,6 +308,7 @@ export class AppEvents { label: app.getName(), enabled: false, icon: ciderIcon, + }, {type: 'separator'},