From 71af19b0d5b158fce56c4373ef44226d0dbf102a Mon Sep 17 00:00:00 2001 From: UnbreakCode Date: Thu, 23 Jun 2022 00:25:55 +0200 Subject: [PATCH 01/13] Update de_DE.json --- src/i18n/de_DE.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/i18n/de_DE.json b/src/i18n/de_DE.json index 071d18eb..dd3b4970 100644 --- a/src/i18n/de_DE.json +++ b/src/i18n/de_DE.json @@ -386,5 +386,13 @@ "term.track": { "one": "Titel", "other": "Titel" - } + }, + "settings.option.visual.customAccentColor": "Benutzerdefinierte Akzentfarbe", + "settings.option.visual.accentColor": "Akzentfarbe", + "settings.option.visual.purplePodcastPlaybackBar": "Lila Wiedergabeleiste für Podcasts", + "settings.option.visual.windowColor": "Fenstertönung Farbe", + "action.cut": "Ausschneiden", + "action.paste": "Einfügen", + "action.selectAll": "Alles auswählen", + "action.delete": "Löschen" } From 569f6c279a843107a179e24f7b7d16eb74964f9f Mon Sep 17 00:00:00 2001 From: Pedro Galhardo Date: Thu, 23 Jun 2022 02:27:58 +0100 Subject: [PATCH 02/13] Bootbox dialog improvements (#1192) * Translate bootbox dialog buttons This also isolates the bootbox dependency. * Migrate delete playlist dialog from window.confirm to bootbox.confirm --- src/renderer/main/events.js | 6 +- src/renderer/main/vueapp.js | 69 +++++++++++++------ src/renderer/views/components/equalizer.ejs | 6 +- src/renderer/views/pages/installed-themes.ejs | 18 ++--- src/renderer/views/pages/keybinds.ejs | 18 ++--- src/renderer/views/pages/plugins-github.ejs | 8 +-- src/renderer/views/pages/settings.ejs | 6 +- src/renderer/views/pages/themes-github.ejs | 4 +- 8 files changed, 80 insertions(+), 55 deletions(-) diff --git a/src/renderer/main/events.js b/src/renderer/main/events.js index 52191c5d..e0a3c45c 100644 --- a/src/renderer/main/events.js +++ b/src/renderer/main/events.js @@ -24,7 +24,7 @@ const Events = { // CTRL + R if (event.keyCode === 82 && event.ctrlKey) { event.preventDefault() - bootbox.confirm(app.getLz('term.reload'), (res)=>{ + app.confirm(app.getLz('term.reload'), (res)=>{ if (res) { window.location.reload() } @@ -69,8 +69,8 @@ const Events = { // Prevent Scrolling on spacebar if (event.keyCode === 32 && event.target === document.body) { event.preventDefault() - app.SpacePause() - + app.SpacePause() + } }); diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index a0c7fb55..0c6c02b6 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -952,22 +952,22 @@ const app = new Vue({ } } catch (e) { localStorage.setItem("playingBitrate", "256") - } + } if (!app.cfg.audio.normalization) {CiderAudio.hierarchical_loading();} - + } - + if (app.cfg.audio.normalization) { // get unencrypted audio previews to get SoundCheck's normalization tag try { let previewURL = null try { - previewURL = app.mk.nowPlayingItem.previewURL + previewURL = app.mk.nowPlayingItem.previewURL } catch (e) { } if (previewURL == null && ((app.mk.nowPlayingItem?._songId ?? (app.mk.nowPlayingItem["songId"] ?? app.mk.nowPlayingItem.relationships.catalog.data[0].id)) != -1)) { app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/songs/${app.mk.nowPlayingItem?._songId ?? (app.mk.nowPlayingItem["songId"] ?? app.mk.nowPlayingItem.relationships.catalog.data[0].id)}`).then((response) => { - previewURL = response.data.data[0].attributes.previews[0].url + previewURL = response.data.data[0].attributes.previews[0].url if (previewURL) console.debug("[Cider][MaikiwiSoundCheck] previewURL response.data.data[0].attributes.previews[0].url: " + previewURL) ipcRenderer.send('getPreviewURL', previewURL) @@ -1173,7 +1173,7 @@ const app = new Vue({ } }, unauthorize() { - bootbox.confirm(app.getLz('term.confirmLogout'), function (result) { + this.confirm(app.getLz('term.confirmLogout'), function (result) { if (result) { app.mk.unauthorize() document.location.reload() @@ -1554,22 +1554,24 @@ const app = new Vue({ }, deletePlaylist(id) { let self = this - if (confirm(app.getLz('term.deletePlaylist'))) { - app.mk.api.v3.music(`/v1/me/library/playlists/${id}`, {}, { - fetchOptions: { - method: "DELETE" - } - }).then(res => { - // remove this playlist from playlists.listing if it exists - let found = self.playlists.listing.find(item => item.id == id) - if (found) { - self.playlists.listing.splice(self.playlists.listing.indexOf(found), 1) - } - setTimeout(() => { - app.refreshPlaylists(false, false); - }, 8000); - }) - } + this.confirm(app.getLz('term.deletePlaylist'), (ok) => { + if (ok) { + app.mk.api.v3.music(`/v1/me/library/playlists/${id}`, {}, { + fetchOptions: { + method: "DELETE" + } + }).then(res => { + // remove this playlist from playlists.listing if it exists + let found = self.playlists.listing.find(item => item.id == id) + if (found) { + self.playlists.listing.splice(self.playlists.listing.indexOf(found), 1) + } + setTimeout(() => { + app.refreshPlaylists(false, false); + }, 8000); + }) + } + }); }, /** * @param {string} url, href for the initial request @@ -4624,6 +4626,29 @@ const app = new Vue({ app.mk._services.mediaItemPlayback._currentPlayer._playAssetURL(src, false) } } + }, + confirm(message, callback) { + bootbox.confirm(this.getBootboxParams(null, message, callback)); + }, + prompt(title, callback) { + bootbox.prompt(this.getBootboxParams(title, null, callback)); + }, + getBootboxParams(title, message, callback) { + return { + title: title, + message: message, + buttons: { + confirm: { + label: app.getLz('dialog.ok'), + }, + cancel: { + label: app.getLz('dialog.cancel'), + }, + }, + callback: function (result) { + if (callback) callback(result); + }, + } } } }) diff --git a/src/renderer/views/components/equalizer.ejs b/src/renderer/views/components/equalizer.ejs index 64acca69..2e7639ca 100644 --- a/src/renderer/views/components/equalizer.ejs +++ b/src/renderer/views/components/equalizer.ejs @@ -280,7 +280,7 @@ }, deletePreset() { let presets = this.$root.cfg.audio.equalizer.presets - bootbox.confirm(app.getLz('term.deletepreset.warn'), (result) => { + app.confirm(app.getLz('term.deletepreset.warn'), (result) => { if (result) { this.changePreset("default") // find the preset by id (preset) and remove it @@ -351,7 +351,7 @@ }, addPreset() { let self = this - bootbox.prompt(app.getLz('term.newpreset.name'), (res) => { + app.prompt(app.getLz('term.newpreset.name'), (res) => { if (res) { let eqSettings = Clone(app.cfg.audio.equalizer) let newPreset = new self.eqPreset() @@ -386,7 +386,7 @@ }, importPreset() { let self = this - bootbox.prompt("Enter preset share code", (res) => { + app.prompt("Enter preset share code", (res) => { if (res) { let preset = JSON.parse(atob(res)) if (preset.frequencies && preset.gain && preset.Q && preset.mix && preset.vibrantBass) { diff --git a/src/renderer/views/pages/installed-themes.ejs b/src/renderer/views/pages/installed-themes.ejs index 6a4b2563..dbb99395 100644 --- a/src/renderer/views/pages/installed-themes.ejs +++ b/src/renderer/views/pages/installed-themes.ejs @@ -4,7 +4,7 @@

- {{ $root.getLz("settings.option.visual.theme.manageStyles") }} + {{ $root.getLz("settings.option.visual.theme.manageStyles") }}

@@ -32,11 +32,11 @@