From ed4dcbe3381f134ac782b9b0be322b362dd68e65 Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Wed, 25 May 2022 19:26:23 -0500 Subject: [PATCH 01/92] ok --- src/main/base/store.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/base/store.ts b/src/main/base/store.ts index 97635911..5d9cda9f 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -13,7 +13,7 @@ export class Store { "general": { "close_button_hide": false, "discordrpc": { - "enabled": false, + "enabled": true, "client": "Cider", "clear_on_pause": true, "hide_buttons": false, From 523a277729119588fa1514587a25e39e843614bf Mon Sep 17 00:00:00 2001 From: Porya Date: Wed, 25 May 2022 18:14:05 -0700 Subject: [PATCH 02/92] Songs Library UI Fix --- src/renderer/less/elements.less | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/renderer/less/elements.less b/src/renderer/less/elements.less index 66aa9aab..cdf1feec 100644 --- a/src/renderer/less/elements.less +++ b/src/renderer/less/elements.less @@ -2083,4 +2083,15 @@ input[type=checkbox][switch]:checked:active::before { pointer-events: none; } } -} \ No newline at end of file +} + +.content-inner { + &.library-page { + .heart-icon { + left: 7px; + } + .cd-mediaitem-list-item { + padding-left: 25px; + } + } +} From 9d51939f0342795eb272d2cc78dc4487cc16f72d Mon Sep 17 00:00:00 2001 From: booploops <49113086+booploops@users.noreply.github.com> Date: Wed, 25 May 2022 20:51:34 -0700 Subject: [PATCH 03/92] collection list now uses grid sizing --- src/renderer/style.less | 16 ++++++++++++++++ src/renderer/views/pages/collection-list.ejs | 9 ++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/renderer/style.less b/src/renderer/style.less index 676e93dc..ef6c2046 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -1930,12 +1930,28 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { max-width: 240px; flex-grow: 1; } + + &.collection-list-square { + display: grid; + grid-template-columns: repeat(4, minmax(200px, 1fr)); + + // screen size > 1200px + @media screen and (min-width: 1500px) { + grid-template-columns: repeat(6, minmax(200px, 1fr)); + } + // less than 1100px + @media screen and (max-width: 1150px) { + grid-template-columns: repeat(3, minmax(200px, 1fr)); + } + } } } .cd-mediaitem-square-container{ display: inline-flex; flex-direction: column; + justify-content: center; + align-items: center; } .reasonSP{ diff --git a/src/renderer/views/pages/collection-list.ejs b/src/renderer/views/pages/collection-list.ejs index d00c3fcd..d76bf62c 100644 --- a/src/renderer/views/pages/collection-list.ejs +++ b/src/renderer/views/pages/collection-list.ejs @@ -1,7 +1,7 @@ - - \ No newline at end of file diff --git a/src/renderer/views/pages/audiolabs.ejs b/src/renderer/views/pages/audiolabs.ejs index 7ef077b5..18ff72f9 100644 --- a/src/renderer/views/pages/audiolabs.ejs +++ b/src/renderer/views/pages/audiolabs.ejs @@ -198,14 +198,6 @@ return name; } }, - toggleSpatial: function () { - if (app.cfg.audio.maikiwiAudio.spatial) { - CiderAudio.spatialOn() - CiderAudio.hierarchical_loading(); - } else { - CiderAudio.spatialOff() - } - }, toggleMaikiwiSpatial: function () { if (app.cfg.audio.maikiwiAudio.spatial === true) { CiderAudio.spatialOn() diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index 755e346a..83da0cd1 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -329,7 +329,7 @@ @@ -1393,7 +1393,7 @@ if (app.cfg.audio.normalization === true) { CiderAudio.normalizerOn() } - if (app.cfg.audio.spatial === true) { + if (app.cfg.audio.maikiwiAudio.spatial === true) { CiderAudio.spatialOn() CiderAudio.hierarchical_loading(); } @@ -1404,7 +1404,7 @@ if (app.cfg.audio.normalization === true) { CiderAudio.normalizerOn() } - if (app.cfg.audio.spatial === true) { + if (app.cfg.audio.maikiwiAudio.spatial === true) { CiderAudio.spatialOn() CiderAudio.hierarchical_loading(); } From 58560ec4c880922422f54c48416d84165dd202b9 Mon Sep 17 00:00:00 2001 From: maikirakiwi Date: Sun, 29 May 2022 16:34:06 -0700 Subject: [PATCH 31/92] I'm a bingus --- src/main/base/browserwindow.ts | 1 - src/renderer/views/app/panels.ejs | 3 --- 2 files changed, 4 deletions(-) diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index 87aaea9b..aec662ab 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -85,7 +85,6 @@ export class BrowserWindow { "components/artwork-material", "components/menu-panel", "components/sidebar-playlist", - "components/spatial-properties", "components/audio-settings", "components/plugin-menu", "components/audio-controls", diff --git a/src/renderer/views/app/panels.ejs b/src/renderer/views/app/panels.ejs index a9bc17b5..972d0546 100644 --- a/src/renderer/views/app/panels.ejs +++ b/src/renderer/views/app/panels.ejs @@ -13,9 +13,6 @@ - - - From 016a9031a2ebcbe284cb894746662fc701da2650 Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Sun, 29 May 2022 18:42:31 -0500 Subject: [PATCH 32/92] putting this back because the store whines so fucking hard. --- src/main/base/store.ts | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/main/base/store.ts b/src/main/base/store.ts index 9a8fe9d5..5d9cda9f 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -153,6 +153,26 @@ export class Store { 'gain': [-0.34, 2.49, 0.23, -0.49, 0.23, -0.12, 0.32, -0.29, 0.33, 0.19, -0.18, -1.27, -0.11, 0.25, -0.18, -0.53, 0.34, 1.32, 1.78, 0.41, -0.28] } }, + "spatial": false, + "spatial_properties": { + "presets": [], + "gain": 0.8, + "listener_position": [0, 0, 0], + "audio_position": [0, 0, 0], + "room_dimensions": { + "width": 32, + "height": 12, + "depth": 32 + }, + "room_materials": { + "left": 'metal', + "right": 'metal', + "front": 'brick-bare', + "back": 'brick-bare', + "down": 'acoustic-ceiling-tiles', + "up": 'acoustic-ceiling-tiles', + } + }, "equalizer": { 'preset': "default", 'frequencies': [32, 63, 125, 250, 500, 1000, 2000, 4000, 8000, 16000], From 1c2d340d69a5ab479b9a1fc8b2e58235474a4a94 Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Sun, 29 May 2022 22:20:04 -0500 Subject: [PATCH 33/92] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fe94ee2a..97f01a9e 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@sentry/electron": "^3.0.7", "@sentry/integrations": "^6.19.6", "adm-zip": "0.4.10", - "airtunes2": "git+https://github.com/vapormusic/node_airtunes2.git#hap", + "airtunes2": "git+https://github.com/ciderapp/node_airtunes2", "castv2-client": "^1.2.0", "chokidar": "^3.5.3", "discord-auto-rpc": "^1.0.16", From 908d580aeff43b2d196487c7d6730cab95b51bef Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Sun, 29 May 2022 23:07:55 -0500 Subject: [PATCH 34/92] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f6cfbb0b..d0515b36 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

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

GitHub Stars GitHub Forks From 2f96a09ed6855f1167bbea1b708439892eb79d64 Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Mon, 30 May 2022 00:34:13 -0500 Subject: [PATCH 35/92] i dislike you --- src/i18n/en_US.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index db9a03f7..96a0aa62 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -2,7 +2,7 @@ "i18n.languageName": "English (US)", "i18n.languageNameEnglish": "English (US)", "i18n.category": "main", - "i18n.authors": "@maikirakiwi @kyw504100 @nosh118", + "i18n.authors": "@maikirakiwi @kyw504100 @nosh118 @cryptofyre", "app.name": "Cider", "date.format": "${m} ${d}, ${y}", "dialog.cancel": "Cancel", @@ -406,6 +406,8 @@ "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.E168_1": "Jasmine Macchiato", "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.Z3600": "Hokkaido Milk Tea", "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.Z8500": "Moonlight Softcake", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.BSCBM": "Brown Sugar Creme Brûlée Milk", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.CUDDLE": "Cuddle Warmth", "settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider Adrenaline Processor™️", "settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "Enhances the perceived audio quality of AAC encoded audio by using a real-time algorithm that takes advantage of both psychoacoustic models of human hearing and AAC encoding characteristics.", "settings.warn.audio.enableAdvancedFunctionality.ciderPPE.compatibility": "CAP is not compatible with Spatialization. Please disable Spatialization to continue.", @@ -426,6 +428,8 @@ "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.minimal": "Minimal", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.audiophile": "Audiophile", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.diffused": "Diffused", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.BPLK": "Encore", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.HW2K": "Expanded Encore", "settings.warn.audio.enableAdvancedFunctionality.audioSpatialization.compatibility": "Spatialization is not compatible with CAP. Please disable CAP to continue.", "settings.option.audio.dbspl.display": "dB SPL Display", "settings.option.audio.dbspl.description": "(Advanced users only) Display dB SPL instead of dBFS on the volume slider.", From f829ec7094bb7f86b977af94f49faad43097eccb Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Mon, 30 May 2022 00:36:43 -0500 Subject: [PATCH 36/92] Update README.md --- src/i18n/README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/i18n/README.md b/src/i18n/README.md index 14616ed5..6cfc9ec4 100644 --- a/src/i18n/README.md +++ b/src/i18n/README.md @@ -427,3 +427,10 @@ Update 24/05/2022 21:15 UTC * `settings.option.general.updateCider.branch.main`: Deleted for all language files * `settings.option.general.updateCider.branch.develop`: Deleted for all language files * `settings.notyf.updateCider.update-error`: Deleted for all language files + +Update 30/5/2022 05:35 UTC + +* `settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.BSCBM`: Added to `en_US` +* `settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.CUDDLE`: Added to `en_US` +* `settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.BPLK`: Added to `en_US` +* `settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.HW2K`: Added to `en_US` From cb66b3585bbd6891e15a393591b690953b9a8daf Mon Sep 17 00:00:00 2001 From: maikirakiwi Date: Sun, 29 May 2022 22:37:46 -0700 Subject: [PATCH 37/92] I love cryptofyre! --- src/i18n/en_US.json | 2 +- src/i18n/hi_IN.json | 2 +- src/i18n/ja_JP.json | 2 +- src/i18n/source/en_US.json | 2 +- src/i18n/zh_CN.json | 2 +- src/i18n/zh_HK.json | 2 +- src/i18n/zh_TW.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index 96a0aa62..c8ed4fee 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -2,7 +2,7 @@ "i18n.languageName": "English (US)", "i18n.languageNameEnglish": "English (US)", "i18n.category": "main", - "i18n.authors": "@maikirakiwi @kyw504100 @nosh118 @cryptofyre", + "i18n.authors": "@notmaikiwi @kyw504100 @nosh118", "app.name": "Cider", "date.format": "${m} ${d}, ${y}", "dialog.cancel": "Cancel", diff --git a/src/i18n/hi_IN.json b/src/i18n/hi_IN.json index f3186db3..d941bf5d 100644 --- a/src/i18n/hi_IN.json +++ b/src/i18n/hi_IN.json @@ -2,7 +2,7 @@ "i18n.languageName": "हिन्दी", "i18n.languageNameEnglish": "Hindi", "i18n.category": "main", - "i18n.authors": "@maikirakiwi @vringster", + "i18n.authors": "@notmaikiwi @vringster", "app.name": "Cider", "date.format": "${m} ${d}, ${y}", "dialog.cancel": "रोकें", diff --git a/src/i18n/ja_JP.json b/src/i18n/ja_JP.json index b7f427ac..4ccdd6dd 100644 --- a/src/i18n/ja_JP.json +++ b/src/i18n/ja_JP.json @@ -2,7 +2,7 @@ "i18n.languageName": "日本語", "i18n.languageNameEnglish": "Japanese", "i18n.category": "main", - "i18n.authors": "@maikirakiwi @tanaka_kakuel", + "i18n.authors": "@notmaikiwi @tanaka_kakuel", "app.name": "Cider", "date.format": "${y}年${m}月${d}日", "dialog.cancel": "キャンセル", diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json index 645309e9..e12e4b7a 100644 --- a/src/i18n/source/en_US.json +++ b/src/i18n/source/en_US.json @@ -2,7 +2,7 @@ "i18n.languageName": "English (US)", "i18n.languageNameEnglish": "English (US)", "i18n.category": "main", - "i18n.authors": "@maikirakiwi @kyw504100 @nosh118", + "i18n.authors": "@notmaikiwi @kyw504100 @nosh118 @cryptofyre", "app.name": "Cider", "date.format": "${m} ${d}, ${y}", "dialog.cancel": "Cancel", diff --git a/src/i18n/zh_CN.json b/src/i18n/zh_CN.json index e949dc0c..d7da0bed 100644 --- a/src/i18n/zh_CN.json +++ b/src/i18n/zh_CN.json @@ -2,7 +2,7 @@ "i18n.languageName": "简体中文（中国）", "i18n.languageNameEnglish": "Simp. Chinese (China)", "i18n.category": "main", - "i18n.authors": "@maikirakiwi @BillKerman @jay900604", + "i18n.authors": "@notmaikiwi @BillKerman @jay900604", "app.name": "Cider", "date.format": "${y}年${m}月${d}日", "dialog.cancel": "取消", diff --git a/src/i18n/zh_HK.json b/src/i18n/zh_HK.json index 44fcc7ce..3595fc18 100644 --- a/src/i18n/zh_HK.json +++ b/src/i18n/zh_HK.json @@ -2,7 +2,7 @@ "i18n.languageName": "繁體中文（香港）", "i18n.languageNameEnglish": "Trad. Chinese (Hong Kong)", "i18n.category": "main", - "i18n.authors": "@kyw504100 @maikirakiwi @BillKerman @jay900604", + "i18n.authors": "@kyw504100 @notmaikiwi @BillKerman @jay900604", "app.name": "Cider", "date.format": "${y} 年 ${m} 月 ${d} 日", "dialog.cancel": "取消", diff --git a/src/i18n/zh_TW.json b/src/i18n/zh_TW.json index 86ebcc6a..a3cf50a8 100644 --- a/src/i18n/zh_TW.json +++ b/src/i18n/zh_TW.json @@ -2,7 +2,7 @@ "i18n.languageName": "繁體中文（臺灣）", "i18n.languageNameEnglish": "Trad. Chinese (Taiwan)", "i18n.category": "main", - "i18n.authors": "@maikirakiwi @jay900604 @kyw504100 @BillKerman", + "i18n.authors": "@notmaikiwi @jay900604 @kyw504100 @BillKerman", "app.name": "Cider", "date.format": "${y}年${m}月${d}日", "dialog.cancel": "取消", From d93b70616660a71c60fb80935911691ad86d2a99 Mon Sep 17 00:00:00 2001 From: maikirakiwi Date: Sun, 29 May 2022 22:38:25 -0700 Subject: [PATCH 38/92] whoops accidentally killed crypto --- src/i18n/en_US.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index c8ed4fee..bf0f2051 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -2,7 +2,7 @@ "i18n.languageName": "English (US)", "i18n.languageNameEnglish": "English (US)", "i18n.category": "main", - "i18n.authors": "@notmaikiwi @kyw504100 @nosh118", + "i18n.authors": "@notmaikiwi @kyw504100 @nosh118 @cryptofyre", "app.name": "Cider", "date.format": "${m} ${d}, ${y}", "dialog.cancel": "Cancel", From 5a73dfeb83bcf5d87b75ef060c8d573cd2059704 Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Mon, 30 May 2022 14:11:03 -0500 Subject: [PATCH 39/92] No. --- src/main/base/store.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/base/store.ts b/src/main/base/store.ts index 5d9cda9f..9241a57b 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -87,14 +87,17 @@ export class Store { "W" ], "audioSettings": [ + "CommandOrControl", process.platform == "darwin" ? "Option" : "Shift", "A" ], "pluginMenu": [ + "CommandOrControl", process.platform == "darwin" ? "Option" : "Shift", "P" ], "castToDevices": [ + "CommandOrControl", process.platform == "darwin" ? "Option" : "Shift", "C" ], From 2d373290869b2acf6f0d961b0b29a7807fdecda8 Mon Sep 17 00:00:00 2001 From: maikirakiwi Date: Mon, 30 May 2022 15:12:59 -0700 Subject: [PATCH 40/92] i18n --- src/i18n/README.md | 2 ++ src/i18n/en_US.json | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/i18n/README.md b/src/i18n/README.md index 6cfc9ec4..69ef37f7 100644 --- a/src/i18n/README.md +++ b/src/i18n/README.md @@ -434,3 +434,5 @@ Update 30/5/2022 05:35 UTC * `settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.CUDDLE`: Added to `en_US` * `settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.BPLK`: Added to `en_US` * `settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.HW2K`: Added to `en_US` +* `settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.adaptive`: Added to `en_US` +* `settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.legacy`: Added to `en_US` diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index bf0f2051..06ad20ad 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -414,6 +414,8 @@ "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength": "CAP Strength", "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.description": "Changes the strength of the processing done to the audio. (Aggressive may yield undesirable results)", "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.standard": "Standard", + "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.adaptive": "Adaptive", + "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.legacy": "Legacy", "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.aggressive": "Aggressive", "settings.option.audio.enableAdvancedFunctionality.audioNormalization": "Audio Normalization", "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "Normalizes peak volume for individual tracks to create a more uniform listening experience. (Does not work on user uploaded tracks)", From 7180441f468f6b02fe1ac2d7b79a7f16f439e62d Mon Sep 17 00:00:00 2001 From: maikirakiwi Date: Mon, 30 May 2022 15:34:59 -0700 Subject: [PATCH 41/92] Japanese translation --- src/i18n/ja_JP.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/i18n/ja_JP.json b/src/i18n/ja_JP.json index 4ccdd6dd..6eb32ad0 100644 --- a/src/i18n/ja_JP.json +++ b/src/i18n/ja_JP.json @@ -334,6 +334,8 @@ "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.E168_1": "春毫ジャスミンマキアート", "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.Z3600": "北海道のロイヤルミルクティー", "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.Z8500": "ムーンライトソフトケーキ", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.BSCBM": "黒糖クレームブリュレミルク", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.CUDDLE": "布団はやわらかいなー", "settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider Adrenaline Processor™️", "settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "音楽をより豊かに、生き生きとさせます", "settings.warn.audio.enableAdvancedFunctionality.ciderPPE.compatibility": "CAPはSpatializationと互換性がありません", @@ -341,6 +343,8 @@ "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.description": "音に施す処理の強さを設定します (強くしすぎると望ましい結果が得られないかもしれません)", "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.standard": "標準", "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.aggressive": "高", + "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.adaptive": "アダプティブ", + "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.legacy": "レガシー", "settings.option.audio.enableAdvancedFunctionality.audioNormalization": "オーディオノーマライズ", "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "さまざまな曲の音量を均一にし、より整った音を楽しめるようにする機能です。", "settings.option.audio.enableAdvancedFunctionality.audioNormalization.disabled": "Audio Labの設定", @@ -350,6 +354,9 @@ "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.description": "プロファイルをSpatializationに変更します", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.standard": "スタンダード", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.audiophile": "Audiophile", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.diffused": "拡散", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.BPLK": "アンコール", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.HW2K": "拡張アンコール", "settings.warn.audio.enableAdvancedFunctionality.audioSpatialization.compatibility": "オーディオ空間化はCAPと互換性がありません", "settings.header.visual": "ビジュアル", "settings.header.visual.description": "Ciderのビジュアル設定", From 23352da0862160be511922fd9bb221b39667026c Mon Sep 17 00:00:00 2001 From: maikirakiwi Date: Mon, 30 May 2022 15:37:05 -0700 Subject: [PATCH 42/92] why is life case sensitive --- src/i18n/README.md | 4 ++-- src/i18n/en_US.json | 4 ++-- src/i18n/ja_JP.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/i18n/README.md b/src/i18n/README.md index 69ef37f7..dee896d0 100644 --- a/src/i18n/README.md +++ b/src/i18n/README.md @@ -432,7 +432,7 @@ Update 30/5/2022 05:35 UTC * `settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.BSCBM`: Added to `en_US` * `settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.CUDDLE`: Added to `en_US` -* `settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.BPLK`: Added to `en_US` -* `settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.HW2K`: Added to `en_US` +* `settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.bplk`: Added to `en_US` +* `settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.hw2k`: Added to `en_US` * `settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.adaptive`: Added to `en_US` * `settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.legacy`: Added to `en_US` diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index 06ad20ad..e06e315d 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -430,8 +430,8 @@ "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.minimal": "Minimal", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.audiophile": "Audiophile", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.diffused": "Diffused", - "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.BPLK": "Encore", - "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.HW2K": "Expanded Encore", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.bplk": "Encore", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.hw2k": "Expanded Encore", "settings.warn.audio.enableAdvancedFunctionality.audioSpatialization.compatibility": "Spatialization is not compatible with CAP. Please disable CAP to continue.", "settings.option.audio.dbspl.display": "dB SPL Display", "settings.option.audio.dbspl.description": "(Advanced users only) Display dB SPL instead of dBFS on the volume slider.", diff --git a/src/i18n/ja_JP.json b/src/i18n/ja_JP.json index 6eb32ad0..72ba9702 100644 --- a/src/i18n/ja_JP.json +++ b/src/i18n/ja_JP.json @@ -355,8 +355,8 @@ "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.standard": "スタンダード", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.audiophile": "Audiophile", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.diffused": "拡散", - "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.BPLK": "アンコール", - "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.HW2K": "拡張アンコール", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.bplk": "アンコール", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.hw2k": "拡張アンコール", "settings.warn.audio.enableAdvancedFunctionality.audioSpatialization.compatibility": "オーディオ空間化はCAPと互換性がありません", "settings.header.visual": "ビジュアル", "settings.header.visual.description": "Ciderのビジュアル設定", From 4f6fcdb9240600e88feb01f62c5f6b4d297a7ffc Mon Sep 17 00:00:00 2001 From: maikirakiwi Date: Mon, 30 May 2022 16:01:28 -0700 Subject: [PATCH 43/92] Japanese update again --- src/i18n/ja_JP.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/i18n/ja_JP.json b/src/i18n/ja_JP.json index 72ba9702..7baf1660 100644 --- a/src/i18n/ja_JP.json +++ b/src/i18n/ja_JP.json @@ -337,7 +337,7 @@ "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.BSCBM": "黒糖クレームブリュレミルク", "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.CUDDLE": "布団はやわらかいなー", "settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider Adrenaline Processor™️", - "settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "音楽をより豊かに、生き生きとさせます", + "settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "人の聴覚心理モデルとAAC符号化の特徴を活用したリアルタイムアルゴリズムにより、AACの認知音質を向上させます。", "settings.warn.audio.enableAdvancedFunctionality.ciderPPE.compatibility": "CAPはSpatializationと互換性がありません", "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength": "CAPの強さ", "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.description": "音に施す処理の強さを設定します (強くしすぎると望ましい結果が得られないかもしれません)", @@ -353,7 +353,9 @@ "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile": "Cider Spatialization Profile", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.description": "プロファイルをSpatializationに変更します", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.standard": "スタンダード", - "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.audiophile": "Audiophile", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.soundstage": "音場", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.separation": "分離感", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.minimal": "ミニマル", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.diffused": "拡散", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.bplk": "アンコール", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.hw2k": "拡張アンコール", From 4ea6f1a64b9a8cfe2e07af94708c547f9c22151a Mon Sep 17 00:00:00 2001 From: maikirakiwi Date: Mon, 30 May 2022 16:21:30 -0700 Subject: [PATCH 44/92] Spatialization is no longer a prereq --- src/i18n/en_US.json | 2 +- src/i18n/ja_JP.json | 2 +- src/i18n/zh_CN.json | 2 +- src/i18n/zh_HK.json | 2 +- src/i18n/zh_TW.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index e06e315d..21d3c9c1 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -421,7 +421,7 @@ "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "Normalizes peak volume for individual tracks to create a more uniform listening experience. (Does not work on user uploaded tracks)", "settings.option.audio.enableAdvancedFunctionality.audioNormalization.disabled": "Managed by Audio Lab", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization": "Cider Tuned Spatialization", - "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.description": "Pre-tuned Spatializing Effect, disables the customizable settings of Audio Spatialization. Spatialization must be enabled as a prerequisite.", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.description": "Pre-tuned Spatializing Effect, disables the customizable settings of Audio Spatialization.", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile": "Cider Spatialization Profile", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.description": "Changes the Tuning Profile of the Spatialization.", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.standard": "Standard", diff --git a/src/i18n/ja_JP.json b/src/i18n/ja_JP.json index 7baf1660..7e7b0ad1 100644 --- a/src/i18n/ja_JP.json +++ b/src/i18n/ja_JP.json @@ -349,7 +349,7 @@ "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "さまざまな曲の音量を均一にし、より整った音を楽しめるようにする機能です。", "settings.option.audio.enableAdvancedFunctionality.audioNormalization.disabled": "Audio Labの設定", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization": "Cider Tuned Spatialization", - "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.description": "開発チームがチューニングした設定を使用することができます。(オーディオ空間化を有効にする必要があります)", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.description": "開発チームがチューニングした設定を使用することができます。", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile": "Cider Spatialization Profile", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.description": "プロファイルをSpatializationに変更します", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.standard": "スタンダード", diff --git a/src/i18n/zh_CN.json b/src/i18n/zh_CN.json index d7da0bed..23b853c3 100644 --- a/src/i18n/zh_CN.json +++ b/src/i18n/zh_CN.json @@ -290,7 +290,7 @@ "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "自动将歌曲播放音量调整到相同水平，享受更舒适的聆听体验。", "settings.option.audio.enableAdvancedFunctionality.audioNormalization.disabled": "此功能由音频实验室管理", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization": "Cider 空间音频效果", - "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.description": "预先调整音频空间效果，关闭空间音讯可自订设置。但必须先打开音频空间才可以做设置。", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.description": "预先调整音频空间效果，关闭空间音讯可自订设置。", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile": "Cider 音频空间配置档", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.description": "变更音频空间的配置档，需重新启动应用程序。", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.standard": "标准", diff --git a/src/i18n/zh_HK.json b/src/i18n/zh_HK.json index 3595fc18..ae29b457 100644 --- a/src/i18n/zh_HK.json +++ b/src/i18n/zh_HK.json @@ -399,7 +399,7 @@ "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "自動將歌曲播放音量調整至相同水平，建立更統一的聆聽體驗。", "settings.option.audio.enableAdvancedFunctionality.audioNormalization.disabled": "由音訊實驗室管理", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization": "Cider 空間音訊效果", - "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.description": "預先調整空間音訊效果，關閉空間音訊可自訂設定。但必須先開啟空間音訊才可以做設定。", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.description": "預先調整空間音訊效果，關閉空間音訊可自訂設定。", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile": "Cider 空間音訊配置檔案", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.description": "變更空間音訊的配置檔案，需要重新啟動應用程式。", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.minimal": "Minimal", diff --git a/src/i18n/zh_TW.json b/src/i18n/zh_TW.json index a3cf50a8..745bb613 100644 --- a/src/i18n/zh_TW.json +++ b/src/i18n/zh_TW.json @@ -287,7 +287,7 @@ "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "自動將歌曲播放音量調整至相同位準，享受更舒適的聆聽體驗。", "settings.option.audio.enableAdvancedFunctionality.audioNormalization.disabled": "此功能由音訊實驗室管理", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization": "Cider 空間音訊效果", - "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.description": "預先調整空間音訊效果，關閉空間音訊可自訂設定。但必須先開啟空間音訊才可以做設定。", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.description": "預先調整空間音訊效果，關閉空間音訊可自訂設定。", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile": "Cider 空間音訊配置檔案", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.description": "變更空間音訊的配置檔案，需要重新啟動應用程式。", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.standard": "標準", From a30aaba1d3203378ddfd343c88ab4e54b09f22c9 Mon Sep 17 00:00:00 2001 From: DecibillyJoel <23534814+DecibillyJoel@users.noreply.github.com> Date: Mon, 30 May 2022 22:01:41 -0400 Subject: [PATCH 45/92] app-mainMenu can be triggered by right click (#1093) Currently you can't open the little Cider popup menu without first uncollapsing the sidebar. This is extremely an extremely unepic sussy amogus L gamer moment. This change allows you to right click to bypass uncollapsing the sidebar and get straight to the hot app-mainMenu action. I think Cider speedrunners will greatly appreciate this quality of life addition. Please consider accepting this PR (short for pull request) to improve the UX (short for user experience). --- src/renderer/main/vueapp.js | 4 +- src/renderer/style.less | 4 +- src/renderer/views/app/app-navigation.ejs | 125 ++++++++++++++++++++++ src/renderer/views/app/chrome-top.ejs | 10 +- src/renderer/views/app/sidebar.ejs | 125 ---------------------- 5 files changed, 136 insertions(+), 132 deletions(-) diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 2ac1e6cf..2501414c 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -299,8 +299,8 @@ const app = new Vue({ formatVolumeTooltip() { return this.cfg.audio.dBSPL ? (Number(this.cfg.audio.dBSPLcalibration) + (Math.log10(this.mk.volume) * 20)).toFixed(2) + ' dB SPL' : (Math.log10(this.mk.volume) * 20).toFixed(2) + ' dBFS' }, - mainMenuVisibility(val) { - if(this.chrome.sidebarCollapsed) { + mainMenuVisibility(val, isContextMenu) { + if(this.chrome.sidebarCollapsed && !isContextMenu) { this.chrome.sidebarCollapsed = false return } diff --git a/src/renderer/style.less b/src/renderer/style.less index 65df8494..61a10664 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -667,7 +667,9 @@ input[type=range].web-slider::-webkit-slider-runnable-track { #cmenu() { .container { position: absolute; - width: 100%; + left: 0px; + width: var(--sidebarWidth); + max-width: var(--sidebarWidth); padding: 10px; z-index: 1; } diff --git a/src/renderer/views/app/app-navigation.ejs b/src/renderer/views/app/app-navigation.ejs index 2f9a5bb2..e937bc99 100644 --- a/src/renderer/views/app/app-navigation.ejs +++ b/src/renderer/views/app/app-navigation.ejs @@ -1,4 +1,129 @@

+ +
+
+ + + + + + + + + + +
+
+ <%- include("sidebar") %> diff --git a/src/renderer/views/app/chrome-top.ejs b/src/renderer/views/app/chrome-top.ejs index 3138e44b..e9a80663 100644 --- a/src/renderer/views/app/chrome-top.ejs +++ b/src/renderer/views/app/chrome-top.ejs @@ -21,8 +21,9 @@
@@ -457,8 +458,9 @@ >
diff --git a/src/renderer/views/app/sidebar.ejs b/src/renderer/views/app/sidebar.ejs index f25539b9..97f4cc14 100644 --- a/src/renderer/views/app/sidebar.ejs +++ b/src/renderer/views/app/sidebar.ejs @@ -183,131 +183,6 @@
- -
-
- - - - - - - - - - -
-
-
+
+
+ {{$root.getLz('settings.option.audio.advanced')}} +
+
+ +
+
From 2fc99b61a4e5914d7419cbf62689008d01a75223 Mon Sep 17 00:00:00 2001 From: UnbreakCode Date: Tue, 31 May 2022 22:52:09 +0200 Subject: [PATCH 50/92] more german translations --- src/i18n/de_DE.json | 63 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 59 insertions(+), 4 deletions(-) diff --git a/src/i18n/de_DE.json b/src/i18n/de_DE.json index c261fe64..acb85688 100644 --- a/src/i18n/de_DE.json +++ b/src/i18n/de_DE.json @@ -7,7 +7,7 @@ "date.format": "${d}.${m}.${y}", "dialog.cancel": "Abbrechen", "dialog.ok": "OK", - "notification.updatingLibrarySongs": "Aktualisiere Songs...", + "notification.updatingLibrarySongs": "Aktualisiere Titel...", "notification.updatingLibraryAlbums": "Aktualisiere Alben...", "notification.updatingLibraryArtists": "Aktualisiere Künstler...", "term.appleInc": "Apple Inc.", @@ -30,7 +30,7 @@ "term.browse": "Entdecken", "term.radio": "Radio", "term.recentlyAdded": "Zuletzt hinzugefügt", - "term.songs": "Songs", + "term.songs": "Titel", "term.albums": "Alben", "term.artists": "Künstler", "term.podcasts": "Podcasts", @@ -282,6 +282,44 @@ "settings.option.experimental.compactUI": "Kompaktes UI", "settings.option.window.close_button_hide": "Schließtaste soll die App verbergen", "settings.option.experimental.inline_playlists": "Inline Playlists und Alben", + "settings.header.advanced": "Erweitert", + "settings.option.debug.openAppData": "Öffne Cider-Ordner", + "settings.option.visual.theme.github.explore": "Durchsuche GitHub Themes", + "settings.option.visual.plugin.github.explore": "Durchsuche GitHub Plugins", + "settings.option.experimental.reinstallwidevine": "WidevineCDM neu installieren", + "settings.option.experimental.reinstallwidevine.confirm": "Möchtest du wirklich Widevine neu installieren?", + "settings.option.visual.theme.checkForUpdates": "Nach Updates suchen", + "settings.option.visual.theme.manageStyles": "Styles Verwalten", + "settings.option.window.useNativeTitleBar": "Native Fenster-Titelleiste verwenden", + "settings.option.window.windowControlStyle": "Fenstersteuerungs-Style", + "settings.option.window.windowControlStyle.right": "Rechts", + "settings.option.experimental.unknownPlugin": "Unbekannte Quellen", + "settings.option.experimental.unknownPlugin.description": "Erlaube Installation von Plugins von anderen Quellen als der Cider-Plugin-Quelle", + "settings.option.window.windowControlStyle.left": "Links", + "settings.option.visual.windowStyle": "Fenster-Style", + "settings.option.general.resumebehavior": "Fortsetzungs-Verhalten", + "settings.option.general.resumebehavior.description": "Fortsetzungs-Verhalten beeinflusst, wie Cider die Sitzung fortsetzt, wenn man zur App zurückkehrt.", + "settings.option.general.resumebehavior.locally": "Lokal", + "settings.option.general.resumebehavior.locally.description": "Cider wird die letzte Sitzung auf diesem Rechner fortsetzen.", + "settings.option.general.resumebehavior.history": "Verlauf", + "settings.option.general.resumebehavior.history.description": "Cider wird den letzten Song aus dem geräteübergreifenden Apple-Music-Verlauf in die Warteschlange stellen.", + "settings.option.general.resumetabs" : "Tab beim Start öffnen", + "settings.option.general.resumetabs.description" : "Wähle welcher Tab beim starten von Cider geöffnet werden soll.", + "settings.option.general.resumetabs.dynamic" : "Dynamisch", + "settings.option.general.resumetabs.dynamic.description" : "Cider wird den zuletzt genutzten Tab öffnen.", + "settings.option.general.keybindings": "Tastenkombinationen", + "settings.option.general.keybindings.pressCombination": "Drücke eine Kombination aus zwei Tasten um die Tastenkombination zu aktualisieren.", + "settings.option.general.keybindings.pressEscape": "Drücke Escape um zurückzugehen.", + "settings.notyf.general.keybindings.update.success": "Tastenkombination erfolgreich aktualisiert", + "settings.prompt.general.keybindings.update.success": "Tastenkombination erfolgreich aktualisiert. Drücke OK um Cider neuzustarten.", + "settings.option.general.keybindings.open": "Öffnen", + "settings.option.general.themeUpdateNotification": "Automatisch nach Theme-Updates suchen", + "settings.option.audio.enableAdvancedFunctionality.audioNormalization.disabled": "Verwaltet vom Audio Lab", + "settings.option.advanced.playlistTrackMapping.description": "Enables deep scanning of playlists to determine which tracks are in which playlists. Playlist cache build times can increase significantly.", + "settings.option.visual.transparent": "Transparentes Fenster", + "settings.option.visual.transparent.description": "Benötigt Theme Support, Neustart erforderlich", + "action.cast.todevices": "An Geräte streamen", + "action.cast.stop": "Streamen an alle Geräte beenden", "spatial.notTurnedOn": "Die Audio-Spatialisierung ist deaktiviert. Um sie zu verwenden, musst du diese zuerst aktivieren.", "spatial.spatialProperties": "Räumliche Einstellungen", "spatial.width": "Breite", @@ -299,10 +337,27 @@ "spatial.right": "Rechts", "spatial.back": "Hinten", "spatial.down": "Unten", - "spatial.listener": "Hörer*in", + "spatial.listener": "Hörer", "spatial.audioSource": "Audioquelle", "settings.header.unfinished": "Unvollendet", + "settings.option.window.openOnStartup": "Öffne Cider beim Start", + "settings.option.window.openOnStartup.hidden": "Öffne minimiert", + "term.audioControls": "Lautstärkeregelung", + "term.variables": "Variablen", + "settings.option.audio.volumeStep": "Lautstärke-Schritt", + "settings.option.audio.maxVolume": "Max. Lautstärke", + "settings.option.audio.changePlaybackRate": "Wiedergabegeschwindigkeit ändern", + "settings.option.audio.playbackRate": "Wiedergabegeschwindigkeit", + "settings.option.audio.playbackRate.change": "Ändern", + "settings.option.audio.dbspl.display": "dB SPL Anzeige", + "settings.option.audio.dbspl.description": "(Nur für erfahrene Benutzer) Zeigt dB SPL anstelle von dBFS am Lautstärkeregler.", + "settings.option.audio.dbfs.calibration": "0 dBFS Kalibration", + "settings.option.audio.dbfs.description": "Geb den Spitzenwert des Z-gewichteten dB SPL an, wenn Cider auf 0 dBFS steht.", + "settings.option.connectivity.discordRPC.hideButtons": "Buttons im Discord Rich Presence ausblenden", + "settings.option.connectivity.discordRPC.hideTimestamp": "Zeitstempel im Discord Rich Presence ausblenden", + "settings.option.general.showLovedTracksInline": "Zeige geliebte Titel inline", "remote.web.title": "Cider Remote", "remote.web.description": "Scanne den QR-Code um dein Handy mit dieser Cider-Instanz zu verbinden", - "about.thanks": "Vielen lieben Dank an das Cider Collective Team und an alle Mithelfer." + "about.thanks": "Vielen lieben Dank an das Cider Collective Team und an alle Mithelfer.", + "action.open": "Öffnen" } From 194324621c19b3c7caaa24a446ed6fe081b83a23 Mon Sep 17 00:00:00 2001 From: UnbreakCode Date: Tue, 31 May 2022 22:54:19 +0200 Subject: [PATCH 51/92] mooore german translations --- src/i18n/de_DE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/de_DE.json b/src/i18n/de_DE.json index acb85688..42fc94f4 100644 --- a/src/i18n/de_DE.json +++ b/src/i18n/de_DE.json @@ -356,6 +356,7 @@ "settings.option.connectivity.discordRPC.hideButtons": "Buttons im Discord Rich Presence ausblenden", "settings.option.connectivity.discordRPC.hideTimestamp": "Zeitstempel im Discord Rich Presence ausblenden", "settings.option.general.showLovedTracksInline": "Zeige geliebte Titel inline", + "settings.option.audio.advanced": "Erweiterte Lautstärkeregelung", "remote.web.title": "Cider Remote", "remote.web.description": "Scanne den QR-Code um dein Handy mit dieser Cider-Instanz zu verbinden", "about.thanks": "Vielen lieben Dank an das Cider Collective Team und an alle Mithelfer.", From d776ce33efe2e5c0000e149cbc20b5728e90b1ef Mon Sep 17 00:00:00 2001 From: UnbreakCode Date: Tue, 31 May 2022 22:55:56 +0200 Subject: [PATCH 52/92] forgot translation oopsie --- src/i18n/de_DE.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/de_DE.json b/src/i18n/de_DE.json index 42fc94f4..dfdbfcf0 100644 --- a/src/i18n/de_DE.json +++ b/src/i18n/de_DE.json @@ -315,7 +315,7 @@ "settings.option.general.keybindings.open": "Öffnen", "settings.option.general.themeUpdateNotification": "Automatisch nach Theme-Updates suchen", "settings.option.audio.enableAdvancedFunctionality.audioNormalization.disabled": "Verwaltet vom Audio Lab", - "settings.option.advanced.playlistTrackMapping.description": "Enables deep scanning of playlists to determine which tracks are in which playlists. Playlist cache build times can increase significantly.", + "settings.option.advanced.playlistTrackMapping.description": "Ermöglicht tiefes Scannen von Wiedergabelisten, um festzustellen, welche Titel sich in welchen Wiedergabelisten befinden. Die Erstellungszeiten für den Wiedergabelisten-Cache können sich erheblich verlängern.", "settings.option.visual.transparent": "Transparentes Fenster", "settings.option.visual.transparent.description": "Benötigt Theme Support, Neustart erforderlich", "action.cast.todevices": "An Geräte streamen", From 17720c9d40672dce2bde95d22428ac17af6c3d4f Mon Sep 17 00:00:00 2001 From: UnbreakCode Date: Tue, 31 May 2022 22:57:52 +0200 Subject: [PATCH 53/92] corrections --- src/i18n/de_DE.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/de_DE.json b/src/i18n/de_DE.json index dfdbfcf0..b08bfb95 100644 --- a/src/i18n/de_DE.json +++ b/src/i18n/de_DE.json @@ -304,12 +304,12 @@ "settings.option.general.resumebehavior.history": "Verlauf", "settings.option.general.resumebehavior.history.description": "Cider wird den letzten Song aus dem geräteübergreifenden Apple-Music-Verlauf in die Warteschlange stellen.", "settings.option.general.resumetabs" : "Tab beim Start öffnen", - "settings.option.general.resumetabs.description" : "Wähle welcher Tab beim starten von Cider geöffnet werden soll.", + "settings.option.general.resumetabs.description" : "Wähle welcher Tab beim Starten von Cider geöffnet werden soll.", "settings.option.general.resumetabs.dynamic" : "Dynamisch", "settings.option.general.resumetabs.dynamic.description" : "Cider wird den zuletzt genutzten Tab öffnen.", "settings.option.general.keybindings": "Tastenkombinationen", "settings.option.general.keybindings.pressCombination": "Drücke eine Kombination aus zwei Tasten um die Tastenkombination zu aktualisieren.", - "settings.option.general.keybindings.pressEscape": "Drücke Escape um zurückzugehen.", + "settings.option.general.keybindings.pressEscape": "Drücke Escape um zurückzukehren.", "settings.notyf.general.keybindings.update.success": "Tastenkombination erfolgreich aktualisiert", "settings.prompt.general.keybindings.update.success": "Tastenkombination erfolgreich aktualisiert. Drücke OK um Cider neuzustarten.", "settings.option.general.keybindings.open": "Öffnen", From b71ab7c328b80be369e27e7b095e02f6e9017765 Mon Sep 17 00:00:00 2001 From: UnbreakCode Date: Tue, 31 May 2022 23:02:39 +0200 Subject: [PATCH 54/92] more translations --- src/i18n/de_DE.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/i18n/de_DE.json b/src/i18n/de_DE.json index b08bfb95..44517285 100644 --- a/src/i18n/de_DE.json +++ b/src/i18n/de_DE.json @@ -360,5 +360,7 @@ "remote.web.title": "Cider Remote", "remote.web.description": "Scanne den QR-Code um dein Handy mit dieser Cider-Instanz zu verbinden", "about.thanks": "Vielen lieben Dank an das Cider Collective Team und an alle Mithelfer.", + "term.navigateBack": "Zurück", + "term.navigateForward": "Weiter", "action.open": "Öffnen" } From c9ca02e750cfbb418ebff892afd72e419bbfb562 Mon Sep 17 00:00:00 2001 From: UnbreakCode Date: Tue, 31 May 2022 23:09:07 +0200 Subject: [PATCH 55/92] audio lab translations --- src/i18n/de_DE.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/i18n/de_DE.json b/src/i18n/de_DE.json index 44517285..a3096fd1 100644 --- a/src/i18n/de_DE.json +++ b/src/i18n/de_DE.json @@ -362,5 +362,9 @@ "about.thanks": "Vielen lieben Dank an das Cider Collective Team und an alle Mithelfer.", "term.navigateBack": "Zurück", "term.navigateForward": "Weiter", + "settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "Verbessert die wahrgenommene Audioqualität von AAC-kodierten Audiodaten durch die Verwendung eines Echtzeit-Algorithmus, der sowohl psychoakustische Modelle des menschlichen Gehörs als auch AAC-Kodierungsmerkmale nutzt.", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer.description": "Verwirklicht eine andere musikalische Atmosphäre, die nach dem Stand der Technik von Audio-Setups modelliert ist.", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.description": "Ändert die Betriebsart des Atmosphere Realizer-Moduls.", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.description": "Vorabgestimmter Spatialisierungseffekt, deaktiviert die anpassbaren Einstellungen der Audio-Spatialisierung.", "action.open": "Öffnen" } From 953a2e4d40806b054ad1bbadb76582ad5c1b5b63 Mon Sep 17 00:00:00 2001 From: UnbreakCode Date: Tue, 31 May 2022 23:12:41 +0200 Subject: [PATCH 56/92] updated search --- src/i18n/de_DE.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/de_DE.json b/src/i18n/de_DE.json index a3096fd1..8451c804 100644 --- a/src/i18n/de_DE.json +++ b/src/i18n/de_DE.json @@ -24,7 +24,7 @@ "term.privateSession": "Private Sitzung", "term.queue": "Warteschlange", "term.history": "Verlauf", - "term.search": "Suche", + "term.search": "Suchen", "term.library": "Mediathek", "term.listenNow": "Jetzt hören", "term.browse": "Entdecken", From ccd94f07022368af5e2a1d3b9975f2bac52cf1f5 Mon Sep 17 00:00:00 2001 From: Jason Chen <45437968+JaxonTekk@users.noreply.github.com> Date: Tue, 31 May 2022 14:54:02 -0700 Subject: [PATCH 57/92] Edit Song Description (#1088) * add editPlayListDescription * add feature to change playlist description * add queue history styling * add queue features * replay styling update * change queue and history headers * fixed the duration css not working --- src/renderer/less/bootstrap.less | 1 + src/renderer/less/elements.less | 42 ++++++++++++++++++--- src/renderer/less/pages.less | 12 +++++- src/renderer/main/vueapp.js | 15 ++++++++ src/renderer/views/components/queue.ejs | 13 ++++++- src/renderer/views/pages/cider-playlist.ejs | 34 +++++++++++++++-- 6 files changed, 105 insertions(+), 12 deletions(-) diff --git a/src/renderer/less/bootstrap.less b/src/renderer/less/bootstrap.less index 870d5e81..a392294e 100644 --- a/src/renderer/less/bootstrap.less +++ b/src/renderer/less/bootstrap.less @@ -845,6 +845,7 @@ padding : 0.5rem 1rem; background-color: rgba(0, 0, 0, 0.03); border-top : 1px solid rgba(0, 0, 0, 0.125); + text-align : center; } .card-footer:last-child { diff --git a/src/renderer/less/elements.less b/src/renderer/less/elements.less index 6fcd72b2..4411cccc 100644 --- a/src/renderer/less/elements.less +++ b/src/renderer/less/elements.less @@ -291,8 +291,10 @@ /* queue item */ .cd-queue-item { - border-bottom: 1px solid rgb(200 200 200 / 10%); - padding: 8px; + border-bottom: 0px solid rgb(200 200 200 / 10%); + padding: 1px; + padding-bottom: 9px; + padding-top: 9px; .row, .col { @@ -301,8 +303,8 @@ } .artwork { - width: 32px; - height: 32px; + width: 42px; + height: 42px; flex: 0 0 auto; } @@ -320,18 +322,46 @@ } .queue-info { + justify-content: center; display: flex; flex-direction: column; + flex-grow: 1; .queue-title { font-size: 14px; } .queue-subtitle { - font-size: 13px; - opacity: 0.85; + font-size: 0.7em; + opacity: 0.7; } } + + .queue-duration-info { + display: flex; + flex-grow: 0; + } + + .queue-duration { + font-size: 14px; + justify-content: center; + min-width: 60px; + height: 100%; + } + + .queue-explicit-icon { + display: flex; + width: 24px; + padding: 0px; + } + + .explicit-icon { + background-image: url("./assets/explicit.svg"); + height: 12px; + width: 36px; + filter: contrast(0); + background-repeat: no-repeat; + } } /* horizontal media scroller */ diff --git a/src/renderer/less/pages.less b/src/renderer/less/pages.less index 2fb5739e..d8648b8e 100644 --- a/src/renderer/less/pages.less +++ b/src/renderer/less/pages.less @@ -667,8 +667,6 @@ .nameEdit { font-weight : 700; font-size : 1.6rem; - margin-bottom: 6px; - margin-right : 6px; flex-shrink : unset; background : transparent; border : 0px; @@ -676,6 +674,16 @@ font-family : inherit; } + .descriptionEdit { + font-size : 14px; + flex-shrink : unset; + background : transparent; + border : 0px; + color : inherit; + font-family : inherit; + width : 60vw; + } + .playlist-artist { font-size : 20px; margin-bottom: 6px; diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 0f97ac99..21bac1eb 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -1350,6 +1350,21 @@ const app = new Vue({ self.refreshPlaylists(false, false) }) }, + async editPlaylistDescription(id, name = app.getLz('term.newPlaylist')) { + let self = this + this.mk.api.v3.music( + `/v1/me/library/playlists/${id}`, {}, { + fetchOptions: { + method: "PATCH", + body: JSON.stringify({ + attributes: { description: name } + }) + } + } + ).then(res => { + self.refreshPlaylists(false, false) + }) + }, copyToClipboard(str) { // if (navigator.userAgent.includes('Darwin') || navigator.appVersion.indexOf("Mac") != -1) { // this.darwinShare(str) diff --git a/src/renderer/views/components/queue.ejs b/src/renderer/views/components/queue.ejs index 597f6b6f..1b7274f9 100644 --- a/src/renderer/views/components/queue.ejs +++ b/src/renderer/views/components/queue.ejs @@ -2,7 +2,8 @@
-

{{app.getLz('term.queue')}}

+

{{app.getLz('term.queue')}}

+

{{app.getLz('term.history')}}

{{ queueItem.item.attributes.artistName }} — {{ queueItem.item.attributes.albumName }}
+
+
+
+
+
{{convertTimeToString(queueItem.item.attributes.durationInMillis)}}
+
@@ -167,6 +174,10 @@ this.selected = -1 app.mk.queue._queueItems = this.queueItems; app.mk.queue._reindex() + }, + convertTimeToString(timeInMilliseconds) { + var seconds = ((timeInMilliseconds % 60000) / 1000).toFixed(0); + return Math.floor(timeInMilliseconds/60000) + ":" + (seconds < 10 ? '0' : '') + seconds; } } }); diff --git a/src/renderer/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs index 2fe6faf2..cb21bba6 100644 --- a/src/renderer/views/pages/cider-playlist.ejs +++ b/src/renderer/views/pages/cider-playlist.ejs @@ -54,9 +54,16 @@ class="content" v-html="data.attributes.description?.short ?? data.attributes.editorialNotes?.short" @click="openInfoModal()"> -
+
{{data.attributes.description?.standard ?? data.attributes.editorialNotes?.standard}}
+
- - <%- include('../pages/library-recentlyadded') %>'); -