diff --git a/approot/release.xml b/approot/release.xml index 448006e3..46b190f8 100644 --- a/approot/release.xml +++ b/approot/release.xml @@ -9,7 +9,7 @@
- ${cover class="Lms-cursor-pointer"} + ${cover class="Lms-cursor-pointer rounded"}

${name}${}[${comment}]${}

diff --git a/src/lms/ui/PlayQueue.cpp b/src/lms/ui/PlayQueue.cpp index 6dae9bc7..530ce1c8 100644 --- a/src/lms/ui/PlayQueue.cpp +++ b/src/lms/ui/PlayQueue.cpp @@ -491,7 +491,7 @@ namespace lms::ui } auto image{ utils::createTrackImage(track->getId(), ArtworkResource::Size::Small) }; - image->addStyleClass("Lms-cover-track"); + image->addStyleClass("Lms-cover-track rounded"); if (const auto release{ track->getRelease() }) { entry->setCondition("if-has-release", true); diff --git a/src/lms/ui/explore/ArtistListHelpers.cpp b/src/lms/ui/explore/ArtistListHelpers.cpp index db8be097..49571f00 100644 --- a/src/lms/ui/explore/ArtistListHelpers.cpp +++ b/src/lms/ui/explore/ArtistListHelpers.cpp @@ -34,7 +34,7 @@ namespace lms::ui::ArtistListHelpers Wt::WAnchor* anchor{ entry->bindWidget("image", utils::createArtistAnchor(artist, false)) }; auto image{ utils::createArtistImage(artist->getId(), ArtworkResource::Size::Large) }; - image->addStyleClass("Lms-cover-release Lms-cover-anchor"); + image->addStyleClass("Lms-cover-release Lms-cover-anchor rounded"); // hack anchor->setImage(std::move(image)); return entry; diff --git a/src/lms/ui/explore/ReleaseHelpers.cpp b/src/lms/ui/explore/ReleaseHelpers.cpp index 1acfa647..b8e14c2a 100644 --- a/src/lms/ui/explore/ReleaseHelpers.cpp +++ b/src/lms/ui/explore/ReleaseHelpers.cpp @@ -38,6 +38,7 @@ namespace lms::ui::releaseListHelpers enum class ReleaseOptions { ShowArtist, + ShowYearAndOriginalYear, ShowYear, }; @@ -51,7 +52,7 @@ namespace lms::ui::releaseListHelpers { Wt::WAnchor* anchor{ entry->bindWidget("cover", utils::createReleaseAnchor(release, false)) }; auto image{ utils::createReleaseCover(release->getId(), ArtworkResource::Size::Large) }; - image->addStyleClass("Lms-cover-release Lms-cover-anchor"); // hack + image->addStyleClass("Lms-cover-release Lms-cover-anchor rounded"); // hack anchor->setImage(std::move(image)); } @@ -65,7 +66,7 @@ namespace lms::ui::releaseListHelpers } } - if (options.contains(ReleaseOptions::ShowYear)) + if (options.contains(ReleaseOptions::ShowYearAndOriginalYear)) { Wt::WString year{ releaseHelpers::buildReleaseYearString(release->getYear(), release->getOriginalYear()) }; if (!year.empty()) @@ -74,6 +75,14 @@ namespace lms::ui::releaseListHelpers entry->bindString("year", year, Wt::TextFormat::Plain); } } + else if (options.contains(ReleaseOptions::ShowYear)) + { + if (release->getYear()) + { + entry->setCondition("if-has-year", true); + entry->bindInt("year", *release->getYear()); + } + } return entry; } @@ -86,7 +95,7 @@ namespace lms::ui::releaseListHelpers std::unique_ptr createEntryForArtist(const db::Release::pointer& release, const db::Artist::pointer& artist) { - return createEntryInternal(release, artist, core::EnumSet{ ReleaseOptions::ShowArtist, ReleaseOptions::ShowYear }); + return createEntryInternal(release, artist, core::EnumSet{ ReleaseOptions::ShowArtist, ReleaseOptions::ShowYearAndOriginalYear }); } std::unique_ptr createEntryForOtherVersions(const db::ObjectPtr& release) diff --git a/src/lms/ui/explore/ReleaseView.cpp b/src/lms/ui/explore/ReleaseView.cpp index 343b03d1..c25c03a2 100644 --- a/src/lms/ui/explore/ReleaseView.cpp +++ b/src/lms/ui/explore/ReleaseView.cpp @@ -569,6 +569,7 @@ namespace lms::ui db::Release::FindParameters params; params.setReleaseGroupMBID(groupMBID); + params.setSortMethod(db::ReleaseSortMethod::DateAsc); const auto releaseIds{ db::Release::findIds(LmsApp->getDbSession(), params) }; if (releaseIds.results.size() <= 1) diff --git a/src/lms/ui/explore/TrackListHelpers.cpp b/src/lms/ui/explore/TrackListHelpers.cpp index 40b62b9f..572b4e80 100644 --- a/src/lms/ui/explore/TrackListHelpers.cpp +++ b/src/lms/ui/explore/TrackListHelpers.cpp @@ -220,7 +220,7 @@ namespace lms::ui::TrackListHelpers } auto image{ utils::createTrackImage(trackId, ArtworkResource::Size::Small) }; - image->addStyleClass("Lms-cover-track"); + image->addStyleClass("Lms-cover-track rounded"); if (track->getRelease()) { entry->setCondition("if-has-release", true);