diff --git a/.circleci/config.yml b/.circleci/config.yml index 4c387387..95a62219 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -168,25 +168,33 @@ workflows: - prepare-build: filters: branches: - only: develop + only: + - main + - stable - build-windows: requires: - prepare-build filters: branches: - only: develop + only: + - main + - stable - build-linux: requires: - prepare-build filters: branches: - only: develop + only: + - main + - stable - build-winget: requires: - prepare-build filters: branches: - only: develop + only: + - main + - stable - release: requires: - build-windows @@ -194,4 +202,6 @@ workflows: - build-winget filters: branches: - only: develop + only: + - main + - stable diff --git a/package.json b/package.json index 0cb23351..c79b2acb 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ }, "devDependencies": { "@types/adm-zip": "^0.5.0", - "@types/discord-rpc": "4.0.2", + "@types/discord-rpc": "4.0.3", "@types/express": "^4.17.13", "@types/qrcode-terminal": "^0.12.0", "@types/ws": "^8.5.3", diff --git a/src/i18n/en_OWO.json b/src/i18n/en_OWO.json index 14a8821f..b6d3136a 100644 --- a/src/i18n/en_OWO.json +++ b/src/i18n/en_OWO.json @@ -311,6 +311,9 @@ "menubar.options.trans": "Twanswation Wepowt/Wequest", "menubar.options.license": "View Wicense", "menubar.options.conf": "Open Configuwation Fiwe in Editow", + "menubar.options.listennow": "Wisten Nyow", + "menubar.options.recentlyAdded": "Wecentwy Added", + "menubar.options.songs": "Songs", "settings.header.general": "Genyewaw", "settings.header.general.description": "Adjust the genyewaw settings fow Cidew.", "settings.option.general.language": "Wanguage", @@ -335,9 +338,13 @@ "settings.option.general.customizeSidebar": "Customize Sidebaw Items", "settings.option.general.customizeSidebar.customize": "Customize", "settings.option.general.keybindings": "Keybindings", + "settings.option.general.keybindings.pressCombination": "Pwess a combinyation of two keys to update keybind.", + "settings.option.general.keybindings.pressEscape": "Pwess Escape key to go back.", "settings.notyf.general.keybindings.update.success": "Keybind updated successfuwwy", "settings.prompt.general.keybindings.update.success": "Keybind updated successfuwwy. Pwess OK to wewaunch Cidew", "settings.option.general.keybindings.open": "Open", + "settings.option.general.themeUpdateNotification": "Automaticawwy check fow theme updates", + "settings.option.general.showLovedTracksInline": "Show wuvd twacks inwinye", "settings.description.search": "Seawch", "settings.description.albums": "Wibwawy Awbums", "settings.description.artists": "Wibwawy Awtists", @@ -349,6 +356,9 @@ "settings.description.cast": "Cast to Devices", "settings.description.settings": "Settings", "settings.description.developer": "Devewopew Toows", + "settings.description.listnow": "Wisten Nyow", + "settings.description.recentAdd": "Wecentwy Added", + "settings.description.songs": "Songs", "settings.notyf.updateCider.update-not-available": "Nyo update avaiwabwe", "settings.notyf.updateCider.update-downloaded": "Update has been downwoaded, westawt to appwy", "settings.notyf.updateCider.update-error": "Ewwow updating Cidew", @@ -406,8 +416,15 @@ "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile": "Cidew Spatiawization Pwofiwe", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.description": "Changes the Tunying Pwofiwe of the Spatiawization.", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.standard": "Standawd", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.soundstage": "Soundstage", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.separation": "Sepawation", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.minimal": "Minyimaw", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.audiophile": "Audiophiwe", "settings.warn.audio.enableAdvancedFunctionality.audioSpatialization.compatibility": "Spatiawization is nyot compatibwe with CAP. Pwease disabwe CAP to continyue.", + "settings.option.audio.dbspl.display": "dB SPW Dispway", + "settings.option.audio.dbspl.description": "(Advanced usews onwy) Dispway dB SPW instead of dBFS on the vowume swidew.", + "settings.option.audio.dbfs.calibration": "0 dBFS Cawibwation", + "settings.option.audio.dbfs.description": "Entew the peak Z-weighted dB SPW when Cidew is at 0 dBFS.", "settings.header.visual": "Visuaw", "settings.header.visual.description": "Adjust the visuaw settings fow Cidew.", "settings.option.visual.windowStyle": "Window Stywe", diff --git a/src/main/base/store.ts b/src/main/base/store.ts index c088ed2e..0edf8b67 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -52,39 +52,39 @@ export class Store { }, "keybindings": { "search": [ - process.platform == "darwin" ? "Command" : "Control", + "CommandOrControl", "F" ], "listnow": [ - process.platform == "darwin" ? "Command" : "Control", + "CommandOrControl", "L" ], "browse": [ - process.platform == "darwin" ? "Command" : "Control", + "CommandOrControl", "B" ], "recentAdd": [ - process.platform == "darwin" ? "Command" : "Control", + "CommandOrControl", "G" ], "songs" : [ - process.platform == "darwin" ? "Command" : "Control", + "CommandOrControl", "J" ], "albums": [ - process.platform == "darwin" ? "Command" : "Control", - "S" + "CommandOrControl", + "A" ], "artists": [ - process.platform == "darwin" ? "Command" : "Control", + "CommandOrControl", "D" ], "togglePrivateSession": [ - process.platform == "darwin" ? "Command" : "Control", + "CommandOrControl", "P" ], "webRemote": [ - process.platform == "darwin" ? "Command" : "Control", + "CommandOrControl", "W" ], "audioSettings": [ @@ -100,12 +100,12 @@ export class Store { "C" ], "settings": [ - process.platform == "darwin" ? "Option" : "Shift", + "CommandOrControl", // Who the hell uses a different key for this? Fucking Option? "S" ], "openDeveloperTools": [ - process.platform == "darwin" ? "Command" : "Control", - process.platform == "darwin" ? "Option" : "Shift", + "CommandOrControl", + "Shift", "I" ] }, diff --git a/src/renderer/less/pages.less b/src/renderer/less/pages.less index b98b560a..b0ee7c36 100644 --- a/src/renderer/less/pages.less +++ b/src/renderer/less/pages.less @@ -114,6 +114,25 @@ margin: 2em; } } +// Search Page +&.search-page { + .cd-mediaitem-square.mediaitem-brick { + width: 530px !important; + .artwork-container .artwork{ + height:168px !important; + width:507px !important; + z-index: 1; + } + .title{ + font-weight: bold; + justify-content: left; + font-size: 18px; + margin-top: -40px; + z-index: 5; + pointer-events: none; + } + } +} // Podcast Page .content-inner.podcasts-page { diff --git a/src/renderer/views/pages/search.ejs b/src/renderer/views/pages/search.ejs index ed71d84e..292f1a62 100644 --- a/src/renderer/views/pages/search.ejs +++ b/src/renderer/views/pages/search.ejs @@ -1,5 +1,5 @@