From eb9e4cb6ab8513a48e8f1b49409b24d3d6291621 Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 14 May 2022 00:00:06 +0200 Subject: [PATCH] Still converting to bootstrap 5. Fixed play queue --- approot/artist.xml | 4 +- approot/playqueue.xml | 54 +++++++---- approot/release.xml | 4 +- approot/releases.xml | 4 +- approot/tracks.xml | 4 +- src/lms/ui/PlayQueue.cpp | 138 ++++++++++++----------------- src/lms/ui/PlayQueue.hpp | 15 ++-- src/lms/ui/explore/ArtistsView.hpp | 2 +- src/lms/ui/explore/SearchView.hpp | 2 +- 9 files changed, 109 insertions(+), 118 deletions(-) diff --git a/approot/artist.xml b/approot/artist.xml index e0f2f17c..47372a71 100644 --- a/approot/artist.xml +++ b/approot/artist.xml @@ -7,9 +7,9 @@

${name}

${clusters class="mb-2"}
- ${play-btn class="btn btn-outline-primary me-2"} + ${play-btn class="btn btn-primary me-2"}
- ${more-btn class="btn btn-outline-primary" data-bs-toggle="dropdown" aria-expanded="false"} + ${more-btn class="btn btn-primary" data-bs-toggle="dropdown" aria-expanded="false"}
  • ${play-shuffled class="btn dropdown-item"}
  • ${play-last class="btn dropdown-item"}
    • diff --git a/approot/playqueue.xml b/approot/playqueue.xml index a30479b4..3746dcf9 100644 --- a/approot/playqueue.xml +++ b/approot/playqueue.xml @@ -2,38 +2,56 @@ - - - - + + + +
    - ${clear-btn class="me-2"}${shuffle-btn class="me-2"}${repeat-btn class="me-2"}${radio-btn class="me-2"} +
    + ${clear-btn class="btn btn-secondary"} +
    +
    + ${shuffle-btn class="btn btn-secondary"} +
    +
    + ${repeat-btn class="btn-check"} + + ${radio-btn class="btn-check"} + +
    ${nb-tracks}
    ${entries}     - - - + + + -
    -
    +
    +
    ${cover}
    -
    - ${name} - ${} - ${}${release}${} - ${}${artists}${} - ${} +
    +
    ${name}
    + ${}${release class="text-decoration-none link-success"}${}
    -
    +
    ${duration} - ${play-btn class="me-2"}${del-btn class="me-2"}${more-btn} +
    +
    + ${play-btn class="btn btn-sm btn-outline-secondary border-0"} + ${del-btn class="btn btn-sm btn-outline-secondary border-0"} +
    + ${more-btn data-bs-toggle="dropdown" aria-expanded="false" class="btn btn-sm btn-outline-secondary border-0"} +
      +
    • ${star class="btn dropdown-item"}
      • +
    • ${download class="btn dropdown-item"}
      • +
    +
    diff --git a/approot/release.xml b/approot/release.xml index a59fcd88..78f56dae 100644 --- a/approot/release.xml +++ b/approot/release.xml @@ -20,9 +20,9 @@
    - ${play-btn class="btn btn-outline-primary me-2"} + ${play-btn class="btn btn-primary me-2"}
    - ${more-btn class="btn btn-outline-primary" data-bs-toggle="dropdown" aria-expanded="false"} + ${more-btn class="btn btn-primary" data-bs-toggle="dropdown" aria-expanded="false"}
    • ${play-shuffled class="btn dropdown-item"}
    • ${play-last class="btn dropdown-item"}
      • diff --git a/approot/releases.xml b/approot/releases.xml index 8e93de3b..99b1b05e 100644 --- a/approot/releases.xml +++ b/approot/releases.xml @@ -25,9 +25,9 @@
    - ${play-btn class="btn btn-outline-primary me-2"} + ${play-btn class="btn btn-primary me-2"}
    - ${more-btn data-bs-toggle="dropdown" aria-expanded="false" class="btn btn-outline-primary"} + ${more-btn data-bs-toggle="dropdown" aria-expanded="false" class="btn btn-primary"}
    • ${play-last class="btn dropdown-item"}
    • ${play-shuffled class="btn dropdown-item"}
      • diff --git a/approot/tracks.xml b/approot/tracks.xml index e7b162ab..9e768216 100644 --- a/approot/tracks.xml +++ b/approot/tracks.xml @@ -26,9 +26,9 @@
    - ${play-btn class="btn btn-outline-primary me-2"} + ${play-btn class="btn btn-primary me-2"}
    - ${more-btn data-bs-toggle="dropdown" aria-expanded="false" class="btn btn-outline-primary"} + ${more-btn data-bs-toggle="dropdown" aria-expanded="false" class="btn btn-primary"}
    • ${play-last class="btn dropdown-item"}
    • ${play-shuffled class="btn dropdown-item"}
      • diff --git a/src/lms/ui/PlayQueue.cpp b/src/lms/ui/PlayQueue.cpp index ab1f9c65..add53483 100644 --- a/src/lms/ui/PlayQueue.cpp +++ b/src/lms/ui/PlayQueue.cpp @@ -19,8 +19,8 @@ #include "PlayQueue.hpp" -#include -#include +#include +#include #include "services/database/Cluster.hpp" #include "services/database/Release.hpp" @@ -45,25 +45,12 @@ namespace UserInterface { PlayQueue::PlayQueue() -: Wt::WTemplate(Wt::WString::tr("Lms.PlayQueue.template")) +: Template {Wt::WString::tr("Lms.PlayQueue.template")} { + addFunction("id", &Wt::WTemplate::Functions::id); addFunction("tr", &Wt::WTemplate::Functions::tr); - { - auto transaction {LmsApp->getDbSession().createSharedTransaction()}; - _repeatAll = LmsApp->getUser()->isRepeatAllSet(); - _radioMode = LmsApp->getUser()->isRadioSet(); - } - - auto setToolTip = [](Wt::WWidget& widget, Wt::WString title) - { - widget.setAttributeValue("data-toggle", "tooltip"); - widget.setAttributeValue("data-placement", "bottom"); - widget.setAttributeValue("title", std::move(title)); - }; - Wt::WText* clearBtn = bindNew("clear-btn", Wt::WString::tr("Lms.PlayQueue.template.clear-btn"), Wt::TextFormat::XHTML); - setToolTip(*clearBtn, Wt::WString::tr("Lms.PlayQueue.clear")); clearBtn->clicked().connect([=] { clearTracks(); @@ -77,7 +64,6 @@ PlayQueue::PlayQueue() }); Wt::WText* shuffleBtn = bindNew("shuffle-btn", Wt::WString::tr("Lms.PlayQueue.template.shuffle-btn"), Wt::TextFormat::XHTML); - setToolTip(*shuffleBtn, Wt::WString::tr("Lms.PlayQueue.shuffle")); shuffleBtn->clicked().connect([=] { { @@ -95,33 +81,33 @@ PlayQueue::PlayQueue() addSome(); }); - _repeatBtn = bindNew("repeat-btn", Wt::WString::tr("Lms.PlayQueue.template.repeat-btn"), Wt::TextFormat::XHTML); - setToolTip(*_repeatBtn, Wt::WString::tr("Lms.PlayQueue.repeat")); + _repeatBtn = bindNew("repeat-btn"); _repeatBtn->clicked().connect([=] { - _repeatAll = !_repeatAll; - updateRepeatBtn(); - auto transaction {LmsApp->getDbSession().createUniqueTransaction()}; if (!LmsApp->getUser()->isDemo()) - LmsApp->getUser().modify()->setRepeatAll(_repeatAll); + LmsApp->getUser().modify()->setRepeatAll(isRepeatAllSet()); }); - updateRepeatBtn(); + { + auto transaction {LmsApp->getDbSession().createSharedTransaction()}; + if (LmsApp->getUser()->isRepeatAllSet()) + _repeatBtn->setCheckState(Wt::CheckState::Checked); + } - _radioBtn = bindNew("radio-btn", Wt::WString::tr("Lms.PlayQueue.template.radio-btn")); - setToolTip(*_radioBtn, Wt::WString::tr("Lms.PlayQueue.radio-mode")); + _radioBtn = bindNew("radio-btn"); _radioBtn->clicked().connect([=] { - _radioMode = !_radioMode; - updateRadioBtn(); - auto transaction {LmsApp->getDbSession().createUniqueTransaction()}; if (!LmsApp->getUser()->isDemo()) - LmsApp->getUser().modify()->setRadio(_radioMode); + LmsApp->getUser().modify()->setRadio(isRadioModeSet()); }); - updateRadioBtn(); + { + auto transaction {LmsApp->getDbSession().createSharedTransaction()}; + if (LmsApp->getUser()->isRadioSet()) + _radioBtn->setCheckState(Wt::CheckState::Checked); + } _nbTracks = bindNew("nb-tracks"); @@ -180,18 +166,16 @@ PlayQueue::PlayQueue() addSome(); } -void -PlayQueue::updateRepeatBtn() +bool +PlayQueue::isRepeatAllSet() const { - _repeatBtn->toggleStyleClass("text-success", _repeatAll); - _repeatBtn->toggleStyleClass("text-muted", !_repeatAll); + return _repeatBtn->checkState() == Wt::CheckState::Checked; } -void -PlayQueue::updateRadioBtn() +bool +PlayQueue::isRadioModeSet() const { - _radioBtn->toggleStyleClass("text-success",_radioMode); - _radioBtn->toggleStyleClass("text-muted", !_radioMode); + return _radioBtn->checkState() == Wt::CheckState::Checked; } Database::TrackList::pointer @@ -243,7 +227,7 @@ PlayQueue::loadTrack(std::size_t pos, bool play) // If out of range, stop playing if (pos >= tracklist->getCount()) { - if (!_repeatAll || tracklist->getCount() == 0) + if (!isRepeatAllSet() || tracklist->getCount() == 0) { stop(); return; @@ -253,7 +237,7 @@ PlayQueue::loadTrack(std::size_t pos, bool play) } // If last and radio mode, fill the next song - if (_radioMode && pos == tracklist->getCount() - 1) + if (isRadioModeSet() && pos == tracklist->getCount() - 1) addRadioTrack = true; _trackPos = pos; @@ -313,9 +297,9 @@ PlayQueue::updateCurrentTrack(bool selected) if (!_trackPos || *_trackPos >= static_cast(_entriesContainer->getCount())) return; - Wt::WTemplate* entry {static_cast(_entriesContainer->getWidget(*_trackPos))}; + Template* entry {static_cast(_entriesContainer->getWidget(*_trackPos))}; if (entry) - entry->bindString("is-selected", selected ? "Lms-playqueue-selected" : ""); + entry->bindString("is-playing", selected ? "TODO" : ""); } std::size_t @@ -410,37 +394,22 @@ PlayQueue::addEntry(const Database::TrackListEntry::pointer& tracklistEntry) const auto track {tracklistEntry->getTrack()}; const Database::TrackId trackId {track->getId()}; - Wt::WTemplate* entry = _entriesContainer->addNew(Wt::WString::tr("Lms.PlayQueue.template.entry")); + Template* entry {_entriesContainer->addNew