From cb9ffae3a54d3c35ae74a9b190d7e63740773b41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=A5=E5=8F=A1?=
<46503943+jay900604@users.noreply.github.com>
Date: Mon, 7 Feb 2022 20:28:37 +0800
Subject: [PATCH 1/3] Update zh_TW.jsonc
Update TW language.
---
src/i18n/zh_TW.jsonc | 34 ++++++++++++++++++++++------------
1 file changed, 22 insertions(+), 12 deletions(-)
diff --git a/src/i18n/zh_TW.jsonc b/src/i18n/zh_TW.jsonc
index e8f4c9fa..3cc992ad 100644
--- a/src/i18n/zh_TW.jsonc
+++ b/src/i18n/zh_TW.jsonc
@@ -54,6 +54,7 @@
"term.mute": "靜音",
"term.unmute": "取消靜音",
"term.share": "分享",
+ "term.share.success": "已複製至剪貼簿",
"term.settings": "設定",
"term.seeAll": "顯示全部",
"term.sortBy": "排序",
@@ -71,7 +72,7 @@
"term.viewAs.list": "列表",
"term.size": "大小",
"term.size.normal": "正常",
- "term.size.compact": "緊凑",
+ "term.size.compact": "緊密",
"term.enable": "啟用",
"term.disable": "停用",
"term.enabled": "已啟用",
@@ -106,14 +107,14 @@
"term.noLyrics": "正在載入。。/ 無歌詞結果 / 純音樂",
"term.copyright": "版權聲明",
"term.rightsReserved": "保留所有權利。",
- "term.sponsor": "贊助",
- "term.socials": "社群",
+ "term.sponsor": "贊助我們",
+ "term.socials": "社群平台",
"term.ciderTeam": "Cider 團隊",
"term.developer": "開發者",
"term.socialTeam": "公關團隊",
"term.contributors": "貢獻者",
"term.equalizer": "等化器",
- "term.reset": "重置",
+ "term.reset": "重設",
"term.tracks": "首歌曲", // Assume x amount of tracks. e.g. 50 tracks
"term.videos": "影片",
"term.menu": "選單",
@@ -191,9 +192,13 @@
"action.tray.show": "顯示",
"action.update": "更新",
"action.copy": "複製",
- "action.newpreset": "新預設", // Equalizer Preset
+ "action.newpreset": "新增預設", // Equalizer Preset
"action.deletepreset": "刪除預設", // Equalizer Preset
-
+
+ // Language optgroups
+ "settings.option.general.language.main": "語言",
+ "settings.option.general.language.fun": "特殊語言",
+ "settings.option.general.language.unsorted": "未分類",
// Settings - Audio
"settings.header.audio": "音訊",
@@ -208,14 +213,14 @@
"settings.header.audio.quality.standard": "高效率",
"settings.header.audio.quality.auto": "自動",
"settings.option.audio.seamlessTransition": "無間斷播放", // Toggle
- "settings.option.audio.enableAdvancedFunctionality": "進階機能", // Toggle
+ "settings.option.audio.enableAdvancedFunctionality": "進階音訊功能", // Toggle
"settings.option.audio.enableAdvancedFunctionality.description": "啟用 AudioContext 將開啟類似音訊平衡和等化器的進階設定。但這並不一定適合每部電腦，可能會發生音樂卡頓。",
"settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider 數位增強音訊處理™️", // Toggle
- "settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "將欺騙您的大腦使其感受近似保真壓縮的音質。| 由 Maikiwi 設計",
+ "settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "將欺騙您的大腦讓您感受到近似保真壓縮的音質。| 由 Maikiwi 設計",
"settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength": "數位增強音訊處理設定", // Toggle
"settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.description": "將更改音訊處理的激進/振奮程度（增強選項有可能會引起雜訊）",
"settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.standard": "標準",
- "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.aggressive": "增强",
+ "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.aggressive": "增強",
"settings.option.audio.enableAdvancedFunctionality.audioNormalization": "音訊平衡", // Toggle
"settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "將平衡輕柔和響亮的歌曲，建立更統一舒適的聆聽體驗。",
"settings.option.audio.enableAdvancedFunctionality.audioSpatialization": "空間音訊", // Toggle
@@ -226,6 +231,7 @@
"settings.option.visual.windowBackgroundStyle": "視窗背景樣式", // Toggle
"settings.header.visual.windowBackgroundStyle.none": "空白",
"settings.header.visual.windowBackgroundStyle.artwork": "專輯封面",
+ "settings.header.visual.windowBackgroundStyle.image": "圖片",
"settings.option.visual.animatedArtwork": "動態專輯封面", // Dropdown
"settings.header.visual.animatedArtwork.always": "總是顯示",
"settings.header.visual.animatedArtwork.limited": "只在藝人頁面和專輯封面顯示",
@@ -242,6 +248,9 @@
"settings.header.visual.hardwareAcceleration.default": "預設",
"settings.header.visual.hardwareAcceleration.webGPU": "WebGPU",
"settings.header.visual.theme": "主題",
+ // Settings - Visual - Theme name
+ "settings.option.visual.theme.default": "Cider",
+ "settings.option.visual.theme.dark": "暗黑模式",
// Refer to term.disabled for the disabled option
"settings.option.visual.showPersonalInfo": "顯示個人檔案", // Toggle
// Settings - General (Reserved)
@@ -260,7 +269,7 @@
"settings.header.connectivity": "外部連接",
"settings.header.connectivity.description": "調整 Cider 與外部的連接",
"settings.option.connectivity.discordRPC": "Discord 動態", // Dropdown
- "settings.option.connectivity.playbackNotifications": "播放通知", // Toggle
+ "settings.option.connectivity.playbackNotifications": "歌曲播放通知", // Toggle
// Refer to term.disabled for the disabled option
"settings.header.connectivity.discordRPC.cider": "顯示正在玩 'Cider'",
"settings.header.connectivity.discordRPC.appleMusic": "顯示正在玩 'Apple Music'",
@@ -274,14 +283,15 @@
// Settings - Experimental
"settings.header.experimental": "實驗性功能",
"settings.header.experimental.description": "調整 Cider 的實驗性功能",
- "settings.option.experimental.compactUI": "緊凑的介面", // Toggle
+ "settings.option.experimental.compactUI": "使用緊密的介面設計", // Toggle
"settings.option.experimental.closeButtonBehaviour": "關閉按鈕操作", // Dropdown
"settings.option.experimental.close_button_hide": "關閉按鈕將 Cider 隱藏至系統列",
- "settings.option.experimental.copy_log": "複製執行紀錄檔剪貼簿",
+ "settings.option.experimental.copy_log": "複製執行紀錄檔至剪貼簿",
"settings.option.experimental.inline_playlists": "將播放列表做為行内元素顯示",
// Refer to term.disabled & term.enabled
// Spatialization Menu
+ "spatial.notTurnedOn": "空間音訊目前是關閉狀態， 請先啟用再使用。",
"spatial.spatialProperties" : "空間音訊屬性設定",
"spatial.width" : "寬度",
"spatial.height" : "高度",
From a758eb3f506a326b87b5d26fee06702d77f87851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=A5=E5=8F=A1?=
<46503943+jay900604@users.noreply.github.com>
Date: Mon, 7 Feb 2022 20:31:34 +0800
Subject: [PATCH 2/3] Update zh_TW.jsonc
---
src/i18n/zh_TW.jsonc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/i18n/zh_TW.jsonc b/src/i18n/zh_TW.jsonc
index 3cc992ad..c1e99179 100644
--- a/src/i18n/zh_TW.jsonc
+++ b/src/i18n/zh_TW.jsonc
@@ -291,7 +291,7 @@
// Refer to term.disabled & term.enabled
// Spatialization Menu
- "spatial.notTurnedOn": "空間音訊目前是關閉狀態， 請先啟用再使用。",
+ "spatial.notTurnedOn": "空間音訊目前是關閉狀態，請先啟用再使用。",
"spatial.spatialProperties" : "空間音訊屬性設定",
"spatial.width" : "寬度",
"spatial.height" : "高度",
From e468b1fa83eae0543647ef1deccfae88ff1eec04 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 7 Feb 2022 14:31:18 +0000
Subject: [PATCH 3/3] Added various controls to menubar, changed volumewheel
function
---
src/main/base/store.ts | 5 +--
src/main/plugins/menubar.ts | 31 ++++++++++++++++++
src/renderer/index.js | 47 ++++++++++++++-------------
src/renderer/views/app/chrome-top.ejs | 2 +-
4 files changed, 58 insertions(+), 27 deletions(-)
diff --git a/src/main/base/store.ts b/src/main/base/store.ts
index eeac1e9c..6aae5ae9 100644
--- a/src/main/base/store.ts
+++ b/src/main/base/store.ts
@@ -26,6 +26,7 @@ export class Store {
},
"audio": {
"volume": 1,
+ "volumeStep": 0.02,
"lastVolume": 1,
"muted": false,
"quality": "HIGH",
@@ -34,10 +35,6 @@ export class Store {
"ciderPPE": false,
"ciderPPE_value": 0.5,
"spatial": false,
- "maxVolume": 1,
- "volumePrecision": 0.1,
- "volumeRoundMax": 0.9,
- "volumeRoundMin": 0.1,
"spatial_properties": {
"presets": [],
"gain": 0.8,
diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts
index 5d729a8b..ec484b40 100644
--- a/src/main/plugins/menubar.ts
+++ b/src/main/plugins/menubar.ts
@@ -95,6 +95,37 @@ export default class Thumbar {
}
]
},
+ {
+ label: 'Controls',
+ submenu: [
+ {
+ label: 'Pause / Play',
+ accelerator: 'Space',
+ click: () => this._win.webContents.executeJavaScript(`MusicKitInterop.playPause()`)
+ },
+ {
+ label: 'Next',
+ accelerator: 'CommandOrControl+Right',
+ click: () => this._win.webContents.executeJavaScript(`MusicKitInterop.next()`)
+ },
+ {
+ label: 'Previous',
+ accelerator: 'CommandOrControl+Left',
+ click: () => this._win.webContents.executeJavaScript(`MusicKitInterop.previous()`)
+ },
+ { type: 'separator' },
+ {
+ label: 'Volume Up',
+ accelerator: 'CommandOrControl+Up',
+ click: () => this._win.webContents.executeJavaScript(`app.volumeUp()`)
+ },
+ {
+ label: 'Volume Down',
+ accelerator: 'CommandOrControl+Down',
+ click: () => this._win.webContents.executeJavaScript(`app.volumeDown()`)
+ }
+ ]
+ },
{
label: 'Account',
submenu: [
diff --git a/src/renderer/index.js b/src/renderer/index.js
index 86dcfa65..e5dba229 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -3307,29 +3307,32 @@ const app = new Vue({
}
})
},
+ checkScrollDirectionIsUp(event) {
+ if (event.wheelDelta) {
+ return event.wheelDelta > 0;
+ }
+ return event.deltaY < 0;
+ },
+ volumeUp() {
+ if ((app.mk.volume + app.cfg.audio.volumeStep) > 1) {
+ app.mk.volume = 1;
+ console.log('setting to 1')
+ } else {
+ console.log('volume up')
+ app.mk.volume += app.cfg.audio.volumeStep;
+ }
+ },
+ volumeDown() {
+ if ((app.mk.volume - app.cfg.audio.volumeStep) < 0) {
+ app.mk.volume = 0;
+ console.log('settings to 0')
+ } else {
+ console.log('volume down')
+ app.mk.volume -= app.cfg.audio.volumeStep;
+ }
+ },
volumeWheel(event) {
- if (this.cfg.audio.maxVolume < 1.0 && this.cfg.audio.maxVolume > 0.01) {
- this.cfg.audio.volumePrecision = 0.01
- this.cfg.audio.volumeRoundMax = this.cfg.audio.maxVolume - 0.01
- this.cfg.audio.volumeRoundMin = 0.01
- }
- if (event.deltaY < 0) {
- if (this.mk.volume < this.cfg.audio.maxVolume) {
- if (this.mk.volume <= this.cfg.audio.volumeRoundMax) {
- this.mk.volume += this.cfg.audio.volumePrecision
- } else {
- this.mk.volume = this.cfg.audio.maxVolume
- }
- }
- } else if (event.deltaY > 0) {
- if (this.mk.volume > 0) {
- if (this.mk.volume >= this.cfg.audio.volumeRoundMin) {
- this.mk.volume -= this.cfg.audio.volumePrecision
- } else {
- this.mk.volume = 0
- }
- }
- }
+ app.checkScrollDirectionIsUp(event) ? app.volumeUp() : app.volumeDown()
},
muteButtonPressed() {
if (this.cfg.audio.muted) {
diff --git a/src/renderer/views/app/chrome-top.ejs b/src/renderer/views/app/chrome-top.ejs
index d9d946fd..15fa6f2f 100644
--- a/src/renderer/views/app/chrome-top.ejs
+++ b/src/renderer/views/app/chrome-top.ejs
@@ -108,7 +108,7 @@
-