okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/Apple-Music-Electron/Cider into develop

Browse source
This commit is contained in:
cryptofyre 2022-04-26 09:47:37 -05:00
commit cedecbf9ec
6 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/i18n/de_DE.json
View file

@ -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",

1
src/i18n/en_US.json
View file

@ -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",

1
src/i18n/source/en_US.json
View file

@ -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",

1
src/main/base/store.ts
View file

@ -142,6 +142,7 @@ export class Store {
"enable_mxm": false,
"mxm_karaoke": false,
"mxm_language": "en",
"enable_qq": false,
"enable_yt": false,
},
"lastfm": {

1
src/renderer/main/vueapp.js
View file

@ -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);

8
src/renderer/views/pages/settings.ejs
View file

@ -802,6 +802,14 @@
<input type="checkbox" v-model="app.cfg.lyrics.enable_yt" switch/>
</div>
</div>
<div class="md-option-line">
<div class="md-option-segment">
{{$root.getLz('settings.option.lyrics.enableQQLyrics')}}
</div>
<div class="md-option-segment md-option-segment_auto">
<input type="checkbox" v-model="app.cfg.lyrics.enable_qq" switch/>
</div>
</div>
</div>
</div>
</b-tab>