From affae68361b10bd04b7230f524ba7869f0e2255d Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 4 May 2024 14:45:17 +0200 Subject: [PATCH] Playlists: now use a dropdown menu for selecting the sort mode --- approot/artists.xml | 2 +- approot/explore.xml | 2 +- approot/tracklists.xml | 23 +-- src/lms/CMakeLists.txt | 2 - src/lms/ui/explore/ArtistsView.cpp | 4 +- src/lms/ui/explore/DropDownMenuSelector.hpp | 71 +++++++++ src/lms/ui/explore/Filters.cpp | 13 +- src/lms/ui/explore/ReleasesView.cpp | 2 +- src/lms/ui/explore/SortModeSelector.cpp | 59 -------- src/lms/ui/explore/SortModeSelector.hpp | 21 +-- .../explore/TrackArtistLinkTypeSelector.cpp | 64 -------- .../explore/TrackArtistLinkTypeSelector.hpp | 27 ++-- src/lms/ui/explore/TrackListsView.cpp | 138 ++++++++---------- src/lms/ui/explore/TrackListsView.hpp | 50 +++---- src/lms/ui/explore/TracksView.cpp | 2 +- 15 files changed, 215 insertions(+), 265 deletions(-) create mode 100644 src/lms/ui/explore/DropDownMenuSelector.hpp delete mode 100644 src/lms/ui/explore/SortModeSelector.cpp delete mode 100644 src/lms/ui/explore/TrackArtistLinkTypeSelector.cpp diff --git a/approot/artists.xml b/approot/artists.xml index ed610c68..12938860 100644 --- a/approot/artists.xml +++ b/approot/artists.xml @@ -25,7 +25,7 @@
  • ${link-type-all class="dropdown-item"}
    • diff --git a/approot/explore.xml b/approot/explore.xml index 5dffd3f9..21d93199 100644 --- a/approot/explore.xml +++ b/approot/explore.xml @@ -55,7 +55,7 @@
    • ${random class="dropdown-item"}
      • diff --git a/approot/tracklists.xml b/approot/tracklists.xml index 7bb0549a..56a40374 100644 --- a/approot/tracklists.xml +++ b/approot/tracklists.xml @@ -3,19 +3,24 @@ -
      -
        -
      • - ${recently-modified class="nav-link"} -
        • -
      • - ${all class="nav-link"} -
        • -
      +
      + ${sort-mode}
      ${tracklists} + +
      + +
        +
      • ${all class="dropdown-item"}
        • +
      • ${recently-modified class="dropdown-item"}
        • +
      +
      +       + ${name class="text-decoration-none link-secondary"} diff --git a/src/lms/CMakeLists.txt b/src/lms/CMakeLists.txt index c3ec3564..c67e9ce6 100644 --- a/src/lms/CMakeLists.txt +++ b/src/lms/CMakeLists.txt @@ -42,8 +42,6 @@ add_executable(lms ui/explore/ReleasesView.cpp ui/explore/ReleaseView.cpp ui/explore/ReleaseTypes.cpp - ui/explore/SortModeSelector.cpp - ui/explore/TrackArtistLinkTypeSelector.cpp ui/explore/TrackCollector.cpp ui/explore/TrackListHelpers.cpp ui/explore/TrackListView.cpp diff --git a/src/lms/ui/explore/ArtistsView.cpp b/src/lms/ui/explore/ArtistsView.cpp index 9437b2e5..25d61ebe 100644 --- a/src/lms/ui/explore/ArtistsView.cpp +++ b/src/lms/ui/explore/ArtistsView.cpp @@ -52,13 +52,13 @@ namespace lms::ui }); SortModeSelector* sortModeSelector{ bindNew("sort-mode", _defaultSortMode) }; - sortModeSelector->sortModeChanged.connect([this](ArtistCollector::Mode sortMode) + sortModeSelector->itemSelected.connect([this](ArtistCollector::Mode sortMode) { refreshView(sortMode); }); TrackArtistLinkTypeSelector* linkTypeSelector{ bindNew("link-type", _defaultLinkType) }; - linkTypeSelector->linkTypeChanged.connect([this](std::optional linkType) + linkTypeSelector->itemSelected.connect([this](std::optional linkType) { refreshView(linkType); }); diff --git a/src/lms/ui/explore/DropDownMenuSelector.hpp b/src/lms/ui/explore/DropDownMenuSelector.hpp new file mode 100644 index 00000000..c9dd104b --- /dev/null +++ b/src/lms/ui/explore/DropDownMenuSelector.hpp @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2024 Emeric Poupon + * + * This file is part of LMS. + * + * LMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * LMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with LMS. If not, see . + */ + +#pragma once + +#include +#include +#include +#include +#include + +namespace lms::ui +{ + template + class DropDownMenuSelector : public Wt::WTemplate + { + public: + // text is the template of the dropdown menu + // "selected-item" is the key for the currently selected entry + DropDownMenuSelector(const Wt::WString& text, ItemType defaultItem) + : Wt::WTemplate{ text } + , _defaultItem{ defaultItem } + { + _selectedItem = bindNew("selected-item"); + } + + void bindItem(const std::string& var, const Wt::WString& title, ItemType item) + { + auto* menuItem{ bindNew(var, title) }; + menuItem->clicked().connect([=] + { + _currentActiveItem->removeStyleClass("active"); + menuItem->addStyleClass("active"); + _currentActiveItem = menuItem; + _selectedItem->setText(title); + + itemSelected.emit(item); + }); + + if (item == _defaultItem) + { + _currentActiveItem = menuItem; + _currentActiveItem->addStyleClass("active"); + _selectedItem->setText(title); + } + } + + Wt::Signal itemSelected; + + private: + const ItemType _defaultItem; + Wt::WWidget* _currentActiveItem{}; + Wt::WText* _selectedItem{}; + }; +} \ No newline at end of file diff --git a/src/lms/ui/explore/Filters.cpp b/src/lms/ui/explore/Filters.cpp index c0d5f03e..4d6e6d9e 100644 --- a/src/lms/ui/explore/Filters.cpp +++ b/src/lms/ui/explore/Filters.cpp @@ -48,12 +48,13 @@ namespace lms::ui { auto typeModel{ std::make_unique() }; - auto transaction{ LmsApp->getDbSession().createReadTransaction() }; - - db::ClusterType::find(LmsApp->getDbSession(), [&](const db::ClusterType::pointer& clusterType) - { - typeModel->add(Wt::WString::fromUTF8(std::string{ clusterType->getName() }), clusterType->getId()); - }); + { + auto transaction{ LmsApp->getDbSession().createReadTransaction() }; + db::ClusterType::find(LmsApp->getDbSession(), [&](const db::ClusterType::pointer& clusterType) + { + typeModel->add(Wt::WString::fromUTF8(std::string{ clusterType->getName() }), clusterType->getId()); + }); + } typeModel->add(Wt::WString::tr("Lms.Explore.media-library"), MediaLibraryTag{}); diff --git a/src/lms/ui/explore/ReleasesView.cpp b/src/lms/ui/explore/ReleasesView.cpp index 088de9a2..f4e4db1c 100644 --- a/src/lms/ui/explore/ReleasesView.cpp +++ b/src/lms/ui/explore/ReleasesView.cpp @@ -53,7 +53,7 @@ namespace lms::ui }); SortModeSelector* sortMode{ bindNew("sort-mode", _defaultMode) }; - sortMode->sortModeChanged.connect([this](ReleaseCollector::Mode sortMode) + sortMode->itemSelected.connect([this](ReleaseCollector::Mode sortMode) { refreshView(sortMode); }); diff --git a/src/lms/ui/explore/SortModeSelector.cpp b/src/lms/ui/explore/SortModeSelector.cpp deleted file mode 100644 index 545fc28a..00000000 --- a/src/lms/ui/explore/SortModeSelector.cpp +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2018 Emeric Poupon - * - * This file is part of LMS. - * - * LMS is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * LMS is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with LMS. If not, see . - */ - -#include "SortModeSelector.hpp" - -#include - -namespace lms::ui -{ - SortModeSelector::SortModeSelector(DatabaseCollectorBase::Mode defaultMode) - : Wt::WTemplate{ Wt::WString::tr("Lms.Explore.template.sort-mode-selector") } - { - auto* sortMode{ bindNew("sort-mode") }; - - auto bindMenuItem{ [this, sortMode, defaultMode](const std::string& var, const Wt::WString& title, DatabaseCollectorBase::Mode mode) - { - auto* menuItem {bindNew(var, title)}; - menuItem->clicked().connect([this, mode, menuItem, sortMode, title] - { - _currentActiveItem->removeStyleClass("active"); - menuItem->addStyleClass("active"); - _currentActiveItem = menuItem; - sortMode->setText(title); - - sortModeChanged.emit(mode); - }); - - if (mode == defaultMode) - { - _currentActiveItem = menuItem; - _currentActiveItem->addStyleClass("active"); - sortMode->setText(title); - } - } }; - - bindMenuItem("random", Wt::WString::tr("Lms.Explore.random"), DatabaseCollectorBase::Mode::Random); - bindMenuItem("starred", Wt::WString::tr("Lms.Explore.starred"), DatabaseCollectorBase::Mode::Starred); - bindMenuItem("recently-played", Wt::WString::tr("Lms.Explore.recently-played"), DatabaseCollectorBase::Mode::RecentlyPlayed); - bindMenuItem("most-played", Wt::WString::tr("Lms.Explore.most-played"), DatabaseCollectorBase::Mode::MostPlayed); - bindMenuItem("recently-added", Wt::WString::tr("Lms.Explore.recently-added"), DatabaseCollectorBase::Mode::RecentlyAdded); - bindMenuItem("all", Wt::WString::tr("Lms.Explore.all"), DatabaseCollectorBase::Mode::All); - } -} // namespace lms::ui diff --git a/src/lms/ui/explore/SortModeSelector.hpp b/src/lms/ui/explore/SortModeSelector.hpp index b32af35f..26c64b79 100644 --- a/src/lms/ui/explore/SortModeSelector.hpp +++ b/src/lms/ui/explore/SortModeSelector.hpp @@ -19,22 +19,25 @@ #pragma once -#include -#include +#include "DropDownMenuSelector.hpp" #include "DatabaseCollectorBase.hpp" namespace lms::ui { - class SortModeSelector : public Wt::WTemplate + class SortModeSelector : public DropDownMenuSelector { public: - SortModeSelector(DatabaseCollectorBase::Mode defaultMode); - - Wt::Signal sortModeChanged; - - private: - Wt::WWidget* _currentActiveItem{}; + SortModeSelector(DatabaseCollectorBase::Mode defaultMode) + : DropDownMenuSelector{ Wt::WString::tr("Lms.Explore.template.sort-mode-selector"), defaultMode } + { + bindItem("random", Wt::WString::tr("Lms.Explore.random"), DatabaseCollectorBase::Mode::Random); + bindItem("starred", Wt::WString::tr("Lms.Explore.starred"), DatabaseCollectorBase::Mode::Starred); + bindItem("recently-played", Wt::WString::tr("Lms.Explore.recently-played"), DatabaseCollectorBase::Mode::RecentlyPlayed); + bindItem("most-played", Wt::WString::tr("Lms.Explore.most-played"), DatabaseCollectorBase::Mode::MostPlayed); + bindItem("recently-added", Wt::WString::tr("Lms.Explore.recently-added"), DatabaseCollectorBase::Mode::RecentlyAdded); + bindItem("all", Wt::WString::tr("Lms.Explore.all"), DatabaseCollectorBase::Mode::All); + } }; } // namespace lms::ui diff --git a/src/lms/ui/explore/TrackArtistLinkTypeSelector.cpp b/src/lms/ui/explore/TrackArtistLinkTypeSelector.cpp deleted file mode 100644 index 2202fd41..00000000 --- a/src/lms/ui/explore/TrackArtistLinkTypeSelector.cpp +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2024 Emeric Poupon - * - * This file is part of LMS. - * - * LMS is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * LMS is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with LMS. If not, see . - */ - -#include "TrackArtistLinkTypeSelector.hpp" - -#include - -namespace lms::ui -{ - TrackArtistLinkTypeSelector::TrackArtistLinkTypeSelector(std::optional defaultLinkType) - : Wt::WTemplate{ Wt::WString::tr("Lms.Explore.Artists.template.track-artist-link-type-selector") } - { - Wt::WText* linkTypeTxt{ bindNew("link-type") }; - - auto bindMenuItem{ [this, linkTypeTxt, defaultLinkType](const std::string& var, const Wt::WString& title, std::optional linkType) - { - auto* menuItem{ bindNew(var, title) }; - menuItem->clicked().connect([=] - { - _currentActiveItem->removeStyleClass("active"); - menuItem->addStyleClass("active"); - _currentActiveItem = menuItem; - linkTypeTxt->setText(title); - - linkTypeChanged.emit(linkType); - }); - - if (linkType == defaultLinkType) - { - _currentActiveItem = menuItem; - _currentActiveItem->addStyleClass("active"); - linkTypeTxt->setText(title); - } - } }; - - bindMenuItem("link-type-all", Wt::WString::tr("Lms.Explore.Artists.linktype-all"), std::nullopt); - bindMenuItem("link-type-artist", Wt::WString::trn("Lms.Explore.Artists.linktype-artist", 2), db::TrackArtistLinkType::Artist); - bindMenuItem("link-type-releaseartist", Wt::WString::trn("Lms.Explore.Artists.linktype-releaseartist", 2), db::TrackArtistLinkType::ReleaseArtist); - bindMenuItem("link-type-composer", Wt::WString::trn("Lms.Explore.Artists.linktype-composer", 2), db::TrackArtistLinkType::Composer); - bindMenuItem("link-type-conductor", Wt::WString::trn("Lms.Explore.Artists.linktype-conductor", 2), db::TrackArtistLinkType::Conductor); - bindMenuItem("link-type-lyricist", Wt::WString::trn("Lms.Explore.Artists.linktype-lyricist", 2), db::TrackArtistLinkType::Lyricist); - bindMenuItem("link-type-mixer", Wt::WString::trn("Lms.Explore.Artists.linktype-mixer", 2), db::TrackArtistLinkType::Mixer); - bindMenuItem("link-type-performer", Wt::WString::trn("Lms.Explore.Artists.linktype-performer", 2), db::TrackArtistLinkType::Performer); - bindMenuItem("link-type-producer", Wt::WString::trn("Lms.Explore.Artists.linktype-producer", 2), db::TrackArtistLinkType::Producer); - bindMenuItem("link-type-remixer", Wt::WString::trn("Lms.Explore.Artists.linktype-remixer", 2), db::TrackArtistLinkType::Remixer); - } -} // namespace lms::ui - diff --git a/src/lms/ui/explore/TrackArtistLinkTypeSelector.hpp b/src/lms/ui/explore/TrackArtistLinkTypeSelector.hpp index fbea71c0..ec37ccfa 100644 --- a/src/lms/ui/explore/TrackArtistLinkTypeSelector.hpp +++ b/src/lms/ui/explore/TrackArtistLinkTypeSelector.hpp @@ -21,22 +21,27 @@ #include -#include -#include - #include "database/Types.hpp" +#include "DropDownMenuSelector.hpp" namespace lms::ui { - class TrackArtistLinkTypeSelector : public Wt::WTemplate + class TrackArtistLinkTypeSelector : public DropDownMenuSelector> { public: - TrackArtistLinkTypeSelector(std::optional defaultLinkType); - - Wt::Signal> linkTypeChanged; - - private: - Wt::WWidget* _currentActiveItem{}; + TrackArtistLinkTypeSelector(std::optional defaultLinkType) + : DropDownMenuSelector{Wt::WString::tr("Lms.Explore.Artists.template.track-artist-link-type-selector") , defaultLinkType} + { + bindItem("link-type-all", Wt::WString::tr("Lms.Explore.Artists.linktype-all"), std::nullopt); + bindItem("link-type-artist", Wt::WString::trn("Lms.Explore.Artists.linktype-artist", 2), db::TrackArtistLinkType::Artist); + bindItem("link-type-releaseartist", Wt::WString::trn("Lms.Explore.Artists.linktype-releaseartist", 2), db::TrackArtistLinkType::ReleaseArtist); + bindItem("link-type-composer", Wt::WString::trn("Lms.Explore.Artists.linktype-composer", 2), db::TrackArtistLinkType::Composer); + bindItem("link-type-conductor", Wt::WString::trn("Lms.Explore.Artists.linktype-conductor", 2), db::TrackArtistLinkType::Conductor); + bindItem("link-type-lyricist", Wt::WString::trn("Lms.Explore.Artists.linktype-lyricist", 2), db::TrackArtistLinkType::Lyricist); + bindItem("link-type-mixer", Wt::WString::trn("Lms.Explore.Artists.linktype-mixer", 2), db::TrackArtistLinkType::Mixer); + bindItem("link-type-performer", Wt::WString::trn("Lms.Explore.Artists.linktype-performer", 2), db::TrackArtistLinkType::Performer); + bindItem("link-type-producer", Wt::WString::trn("Lms.Explore.Artists.linktype-producer", 2), db::TrackArtistLinkType::Producer); + bindItem("link-type-remixer", Wt::WString::trn("Lms.Explore.Artists.linktype-remixer", 2), db::TrackArtistLinkType::Remixer); + } }; } // namespace lms::ui - diff --git a/src/lms/ui/explore/TrackListsView.cpp b/src/lms/ui/explore/TrackListsView.cpp index 4d903964..dd1acf1c 100644 --- a/src/lms/ui/explore/TrackListsView.cpp +++ b/src/lms/ui/explore/TrackListsView.cpp @@ -29,6 +29,7 @@ #include "Filters.hpp" #include "LmsApplication.hpp" #include "Utils.hpp" +#include "DropDownMenuSelector.hpp" namespace lms::ui { @@ -41,27 +42,16 @@ namespace lms::ui addFunction("tr", &Wt::WTemplate::Functions::tr); addFunction("id", &Wt::WTemplate::Functions::id); - auto bindMenuItem{ [this](const std::string& var, const Wt::WString& title, Mode mode) + using SortModeSelector = DropDownMenuSelector; + SortModeSelector* sortModeSelector{ bindNew("sort-mode", Wt::WString::tr("Lms.Explore.TrackLists.template.sort-mode"), _mode) }; + sortModeSelector->bindEntry("recently-modified", Wt::WString::tr("Lms.Explore.recently-modified"), Mode::RecentlyModified); + sortModeSelector->bindEntry("all", Wt::WString::tr("Lms.Explore.all"), Mode::All); + + sortModeSelector->entrySelected.connect(this, [this](TrackLists::Mode mode) { - auto* menuItem {bindNew(var, title)}; - menuItem->clicked().connect([this, mode, menuItem] - { - _mode = mode; - refreshView(); - _currentActiveItem->removeStyleClass("active"); - menuItem->addStyleClass("active"); - _currentActiveItem = menuItem; - }); - - if (mode == _mode) - { - _currentActiveItem = menuItem; - _currentActiveItem->addStyleClass("active"); - } - } }; - - bindMenuItem("recently-modified", Wt::WString::tr("Lms.Explore.recently-modified"), Mode::RecentlyModified); - bindMenuItem("all", Wt::WString::tr("Lms.Explore.all"), Mode::All); + _mode = mode; + refreshView(); + }); _container = bindNew("tracklists", Wt::WString::tr("Lms.Explore.TrackLists.template.container")); _container->onRequestElements.connect([this] @@ -75,67 +65,67 @@ namespace lms::ui }); refreshView(); - } - - void TrackLists::onTrackListDeleted(db::TrackListId trackListId) - { - auto itTrackList{ _trackListWidgets.find(trackListId) }; - if (itTrackList == std::end(_trackListWidgets)) - return; - - _container->remove(*itTrackList->second); - _trackListWidgets.erase(itTrackList); - } - - void TrackLists::refreshView() - { - _container->reset(); - _trackListWidgets.clear(); - } - - void TrackLists::addSome() - { - const Range range{ static_cast(_container->getCount()), _batchSize }; - - Session& session{ LmsApp->getDbSession() }; - auto transaction{ session.createReadTransaction() }; - - TrackList::FindParameters params; - params.setClusters(_filters.getClusters()); - params.setMediaLibrary(_filters.getMediaLibrary()); - params.setUser(LmsApp->getUserId()); - params.setType(TrackListType::Playlist); - params.setRange(range); - switch (_mode) - { - case Mode::All: - params.setSortMethod(TrackListSortMethod::Name); - break; - case Mode::RecentlyModified: - params.setSortMethod(TrackListSortMethod::LastModifiedDesc); - break; } - const auto trackListIds{ TrackList::find(session, params) }; - for (const TrackListId trackListId : trackListIds.results) + void TrackLists::onTrackListDeleted(db::TrackListId trackListId) { - if (const TrackList::pointer trackList{ TrackList::find(LmsApp->getDbSession(), trackListId) }) - addTracklist(trackList); + auto itTrackList{ _trackListWidgets.find(trackListId) }; + if (itTrackList == std::end(_trackListWidgets)) + return; + + _container->remove(*itTrackList->second); + _trackListWidgets.erase(itTrackList); } - _container->setHasMore(trackListIds.moreResults); - } + void TrackLists::refreshView() + { + _container->reset(); + _trackListWidgets.clear(); + } - void TrackLists::addTracklist(const ObjectPtr& trackList) - { - const TrackListId trackListId{ trackList->getId() }; + void TrackLists::addSome() + { + const Range range{ static_cast(_container->getCount()), _batchSize }; - WTemplate* entry{ _container->addNew