From 399ca6c9a592511cf26197aea0cb3e19a131fc3c Mon Sep 17 00:00:00 2001 From: UnbreakCode Date: Tue, 26 Apr 2022 14:02:39 +0200 Subject: [PATCH 1/2] added toggle for qq lyrics --- src/i18n/de_DE.json | 1 + src/i18n/en_US.json | 1 + src/i18n/source/en_US.json | 1 + src/renderer/main/vueapp.js | 1 + src/renderer/views/pages/settings.ejs | 8 ++++++++ 5 files changed, 12 insertions(+) diff --git a/src/i18n/de_DE.json b/src/i18n/de_DE.json index 28d148f1..8927b95d 100644 --- a/src/i18n/de_DE.json +++ b/src/i18n/de_DE.json @@ -276,6 +276,7 @@ "settings.option.lyrics.enableMusixmatchKaraoke": "Aktiviere Karaoke-Modus (nur mit Musixmatch)", "settings.option.lyrics.musixmatchPreferredLanguage": "Bevorzugte Sprache für Musixmatch-Übersetzung", "settings.option.lyrics.enableYoutubeLyrics": "Aktiviere YouTube-Liedtexte für Musikvideos", + "settings.option.lyrics.enableQQLyrics": "Aktiviere QQ Liedtexte", "settings.header.connectivity": "Konnektivität", "settings.header.connectivity.description": "Passe die Konnektivitäts-Einstellungen für Cider an.", "settings.option.connectivity.discordRPC": "Discord Rich Presence", diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index d45fee70..e3a8eb71 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -410,6 +410,7 @@ "settings.option.lyrics.enableMusixmatchKaraoke": "Enable Karaoke Mode (Musixmatch only)", "settings.option.lyrics.musixmatchPreferredLanguage": "Musixmatch Translation Preferred Language", "settings.option.lyrics.enableYoutubeLyrics": "Enable Youtube Lyrics for Music Videos", + "settings.option.lyrics.enableQQLyrics": "Enable QQ Lyrics", "settings.header.connectivity": "Connectivity", "settings.header.connectivity.description": "Adjust the connectivity settings for Cider.", "settings.option.connectivity.playbackNotifications": "Playback Notifications", diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json index d45fee70..e3a8eb71 100644 --- a/src/i18n/source/en_US.json +++ b/src/i18n/source/en_US.json @@ -410,6 +410,7 @@ "settings.option.lyrics.enableMusixmatchKaraoke": "Enable Karaoke Mode (Musixmatch only)", "settings.option.lyrics.musixmatchPreferredLanguage": "Musixmatch Translation Preferred Language", "settings.option.lyrics.enableYoutubeLyrics": "Enable Youtube Lyrics for Music Videos", + "settings.option.lyrics.enableQQLyrics": "Enable QQ Lyrics", "settings.header.connectivity": "Connectivity", "settings.header.connectivity.description": "Adjust the connectivity settings for Cider.", "settings.option.connectivity.playbackNotifications": "Playback Notifications", diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 78937242..c6bfe12b 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -2952,6 +2952,7 @@ const app = new Vue({ } }, loadQQLyrics() { + if (!app.cfg.lyrics.enable_qq) return; const track = encodeURIComponent((this.mk.nowPlayingItem != null) ? this.mk.nowPlayingItem.title ?? '' : ''); const artist = encodeURIComponent((this.mk.nowPlayingItem != null) ? this.mk.nowPlayingItem.artistName ?? '' : ''); const time = encodeURIComponent((this.mk.nowPlayingItem != null) ? (Math.round((this.mk.nowPlayingItem.attributes["durationInMillis"] ?? -1000) / 1000) ?? -1) : -1); diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index 1830333b..83d821d5 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -802,6 +802,14 @@ +
+
+ {{$root.getLz('settings.option.lyrics.enableQQLyrics')}} +
+
+ +
+
From 98ac593b015c034048fe23d7face8e7a46e06613 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Tue, 26 Apr 2022 14:05:36 +0000 Subject: [PATCH 2/2] Added QQLyrics cfg default to store.ts --- src/main/base/store.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/base/store.ts b/src/main/base/store.ts index fe9cd36e..e7a62278 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -142,6 +142,7 @@ export class Store { "enable_mxm": false, "mxm_karaoke": false, "mxm_language": "en", + "enable_qq": false, "enable_yt": false, }, "lastfm": {