From 34f719d2fe57487e4b9847118e5f0ba9e3a37b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=A5=E5=8F=A1?= <46503943+jay900604@users.noreply.github.com> Date: Fri, 18 Feb 2022 13:10:19 +0800 Subject: [PATCH 1/5] Update zh_TW.jsonc (#468) Update TW language. Co-authored-by: Maikiwi --- src/i18n/zh_TW.jsonc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/i18n/zh_TW.jsonc b/src/i18n/zh_TW.jsonc index d66c4f73..45f48cb0 100644 --- a/src/i18n/zh_TW.jsonc +++ b/src/i18n/zh_TW.jsonc @@ -108,6 +108,7 @@ "term.fullscreenView": "全螢幕顯示", "term.defaultView": "預設顯示", "term.audioSettings": "音訊設定", + "term.audioControls": "音訊控制", "term.spacializedAudioSetting": "空間音訊設定", "term.clearAll": "清空", "term.recentStations": "最近收聽的廣播", @@ -209,6 +210,7 @@ "action.copy": "複製", "action.newpreset": "新增預設", // Equalizer Preset "action.deletepreset": "刪除預設", // Equalizer Preset + "action.open": "開啟", // Settings - General "settings.header.general": "一般", @@ -229,8 +231,8 @@ // Settings - Audio "settings.header.audio": "音訊", "settings.header.audio.description": "調整 Cider 的音訊設定", - "settings.option.audio.volumeStep": "音量改變量", - "settings.option.audio.maxVolume": "最高音量", + "settings.option.audio.volumeStep": "最小音量", + "settings.option.audio.maxVolume": "最大音量", "settings.option.audio.quality": "音訊品質", // Dropdown "settings.header.audio.quality.hireslossless": "高品質無損壓縮", "settings.header.audio.quality.hireslossless.description": "（高達 24-bit/192 kHz）", @@ -314,13 +316,17 @@ "settings.option.connectivity.lastfmScrobble.filterLoop": "不記錄單曲循環 (LastFM)", // Refer to term.connect for the connect button + // Settings - Debug + "settings.header.debug": "除錯", + "settings.option.debug.copy_log": "複製執行紀錄檔至剪貼簿", + "settings.option.debug.openAppData": "打開 Cider 資料夾", + // Settings - Experimental "settings.header.experimental": "實驗性功能", "settings.header.experimental.description": "調整 Cider 的實驗性功能", "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.inline_playlists": "將播放列表做為行内元素顯示", // Refer to term.disabled & term.enabled From 9aaddadd3eaaf76ca4e4522908f58392fad7cc3f Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Thu, 17 Feb 2022 21:11:56 -0800 Subject: [PATCH 2/5] 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 45f48cb0..b53162a9 100644 --- a/src/i18n/zh_TW.jsonc +++ b/src/i18n/zh_TW.jsonc @@ -231,7 +231,7 @@ // Settings - Audio "settings.header.audio": "音訊", "settings.header.audio.description": "調整 Cider 的音訊設定", - "settings.option.audio.volumeStep": "最小音量", + "settings.option.audio.volumeStep": "音量改變量", "settings.option.audio.maxVolume": "最大音量", "settings.option.audio.quality": "音訊品質", // Dropdown "settings.header.audio.quality.hireslossless": "高品質無損壓縮", From 66ca32bd1d4bd743386a3eb2b6fcc3c226afa3c1 Mon Sep 17 00:00:00 2001 From: booploops <49113086+booploops@users.noreply.github.com> Date: Thu, 17 Feb 2022 22:12:22 -0800 Subject: [PATCH 3/5] frontend plugins first iteration --- src/main/base/plugins.ts | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/base/plugins.ts b/src/main/base/plugins.ts index 3dc77b0f..ccb7f2e4 100644 --- a/src/main/base/plugins.ts +++ b/src/main/base/plugins.ts @@ -32,6 +32,7 @@ export class Plugins { if (fs.existsSync(this.userPluginsPath)) { fs.readdirSync(this.userPluginsPath).forEach(file => { + // Plugins V1 if (file.endsWith('.ts') || file.endsWith('.js')) { if (!electron.app.isPackaged) { const plugin = require(path.join(this.userPluginsPath, file)).default; @@ -50,7 +51,24 @@ export class Plugins { plugins[file] = new plugin(electron.app, utils.getStore()); } } - + } + // Plugins V2 + else if (fs.lstatSync(path.join(this.userPluginsPath, file)).isDirectory()) { + const pluginPath = path.join(this.userPluginsPath, file); + if (fs.existsSync(path.join(pluginPath, 'package.json'))) { + const plugin = require(path.join(pluginPath, "index.js")); + if (plugins[plugin.name] || plugin.name in plugins) { + console.log(`[${plugin.name}] Plugin already loaded / Duplicate Class Name`); + } else { + const pluginEnv = { + app: electron.app, + store: utils.getStore(), + utils: utils, + dir: pluginPath + } + plugins[plugin.name] = new plugin(pluginEnv); + } + } } }); } From dd879b46c58f1481b6cbbae16acb45be8cb69b31 Mon Sep 17 00:00:00 2001 From: child_duckling <19170969+quacksire@users.noreply.github.com> Date: Thu, 17 Feb 2022 22:26:51 -0800 Subject: [PATCH 4/5] trans prep --- src/main/base/browserwindow.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index 8e079151..c4fbcafd 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -95,10 +95,11 @@ export class BrowserWindow { transparent: process.platform === "darwin", hasShadow: false, show: false, - backgroundColor: "#1E1E1E", + //backgroundColor: "#1E1E1E", titleBarStyle: 'hidden', trafficLightPosition: {x: 15, y: 20}, webPreferences: { + experimentalFeatures: true, nodeIntegration: true, sandbox: true, allowRunningInsecureContent: true, From 231936c0c720d2dc8d499a281f46d974c8ece3f9 Mon Sep 17 00:00:00 2001 From: booploops <49113086+booploops@users.noreply.github.com> Date: Thu, 17 Feb 2022 22:45:59 -0800 Subject: [PATCH 5/5] macOS transparency --- src/main/base/browserwindow.ts | 10 +++++++--- src/renderer/index.js | 2 +- src/renderer/less/macos.less | 17 +++++++++++++++++ src/renderer/style.less | 1 + 4 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 src/renderer/less/macos.less diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index c4fbcafd..9c89b50f 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -91,11 +91,11 @@ export class BrowserWindow { minHeight: 390, frame: false, title: "Cider", - vibrancy: "fullscreen-ui", + vibrancy: "dark", transparent: process.platform === "darwin", - hasShadow: false, + hasShadow: true, show: false, - //backgroundColor: "#1E1E1E", + // backgroundColor: "#1E1E1E", titleBarStyle: 'hidden', trafficLightPosition: {x: 15, y: 20}, webPreferences: { @@ -130,8 +130,12 @@ export class BrowserWindow { switch(process.platform) { default: + break; + case "win32": + this.options.backgroundColor = "#1E1E1E"; break; case "linux": + this.options.backgroundColor = "#1E1E1E"; this.options.autoHideMenuBar = true this.options.frame = true break; diff --git a/src/renderer/index.js b/src/renderer/index.js index c0b0442d..cc0f3c3b 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -452,7 +452,7 @@ const app = new Vue({ history.forward() }, getHTMLStyle() { - document.querySelector("html").style.background = "#222"; + // document.querySelector("html").style.background = "#222"; document.querySelector("body").classList.add("notransparency") }, resetState() { diff --git a/src/renderer/less/macos.less b/src/renderer/less/macos.less new file mode 100644 index 00000000..af21338b --- /dev/null +++ b/src/renderer/less/macos.less @@ -0,0 +1,17 @@ +body[platform="darwin"] { + html { + background: transparent!important; + } + + &.notransparency::before { + display: none; + } + #app { + &.simplebg { + background: transparent; + } + &::before { + display: none; + } + } +} \ No newline at end of file diff --git a/src/renderer/style.less b/src/renderer/style.less index 08813883..6ae9c835 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -3110,5 +3110,6 @@ body[platform='darwin'] { } +@import url("less/macos.less"); @import url("less/linux.less"); @import url("less/compact.less");