owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Still converting to bootstrap 5. Fixed tracks current position display

Browse Source
This commit is contained in:
emeric
2022-05-14 16:27:01 +02:00
parent 55805507e4
commit 055e76ae5d
3 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lms/ui/PlayQueue.cpp
+1 -5
View File
@@ -301,11 +301,7 @@ PlayQueue::updateCurrentTrack(bool selected)
if (!entry) if (!entry)
return; return;
if (selected) entry->toggleStyleClass("Lms-entry-playing", selected);
entry->addStyleClass("bg-dark");
else
entry->removeStyleClass("bg-dark");
} }
std::size_t std::size_t
src/lms/ui/explore/ReleaseView.cpp
+3 -4
View File
@@ -323,16 +323,15 @@ Release::refreshView()
LmsApp->getMediaPlayer().trackLoaded.connect(entry, [=] (TrackId loadedTrackId) LmsApp->getMediaPlayer().trackLoaded.connect(entry, [=] (TrackId loadedTrackId)
{ {
entry->bindString("is-playing", loadedTrackId == trackId ? "Lms-entry-playing" : ""); entry->toggleStyleClass("Lms-entry-playing", loadedTrackId == trackId);
}); });
if (auto trackIdLoaded {LmsApp->getMediaPlayer().getTrackLoaded()}) if (auto trackIdLoaded {LmsApp->getMediaPlayer().getTrackLoaded()})
{ {
if (*trackIdLoaded == trackId) entry->toggleStyleClass("Lms-entry-playing", *trackIdLoaded == trackId);
entry->bindString("is-playing", "Lms-entry-playing");
} }
else else
entry->bindString("is-playing", ""); entry->removeStyleClass("Lms-entry-playing");
} }
} }
src/lms/ui/explore/TrackListHelpers.cpp
+14 -12
View File
@@ -30,6 +30,7 @@
#include "services/scrobbling/IScrobblingService.hpp" #include "services/scrobbling/IScrobblingService.hpp"
#include "services/database/Session.hpp" #include "services/database/Session.hpp"
#include "services/database/Track.hpp" #include "services/database/Track.hpp"
#include "utils/Logger.hpp"
#include "utils/Service.hpp" #include "utils/Service.hpp"
#include "common/Template.hpp" #include "common/Template.hpp"
@@ -84,14 +85,14 @@ namespace UserInterface::TrackListHelpers
tracksAction.emit(PlayQueueAction::Play, {trackId}); tracksAction.emit(PlayQueueAction::Play, {trackId});
}); });
{ entry->bindNew<Wt::WPushButton>("more-btn", Wt::WString::tr("Lms.Explore.template.more-btn"), Wt::TextFormat::XHTML);
entry->bindNew<Wt::WPushButton>("more-btn", Wt::WString::tr("Lms.Explore.template.more-btn"), Wt::TextFormat::XHTML); entry->bindNew<Wt::WPushButton>("play-last", Wt::WString::tr("Lms.Explore.play-last"))
entry->bindNew<Wt::WPushButton>("play-last", Wt::WString::tr("Lms.Explore.play-last")) ->clicked().connect([=, &tracksAction]
->clicked().connect([=, &tracksAction] {
{ tracksAction.emit(PlayQueueAction::PlayLast, {trackId});
tracksAction.emit(PlayQueueAction::PlayLast, {trackId}); });
});
{
auto isStarred {[=] { return Service<Scrobbling::IScrobblingService>::get()->isStarred(LmsApp->getUserId(), trackId); }}; auto isStarred {[=] { return Service<Scrobbling::IScrobblingService>::get()->isStarred(LmsApp->getUserId(), trackId); }};
Wt::WPushButton* starBtn {entry->bindNew<Wt::WPushButton>("star", Wt::WString::tr(isStarred() ? "Lms.Explore.unstar" : "Lms.Explore.star"))}; Wt::WPushButton* starBtn {entry->bindNew<Wt::WPushButton>("star", Wt::WString::tr(isStarred() ? "Lms.Explore.unstar" : "Lms.Explore.star"))};
@@ -111,21 +112,22 @@ namespace UserInterface::TrackListHelpers
} }
}); });
entry->bindNew<Wt::WPushButton>("download", Wt::WString::tr("Lms.Explore.download"))
->setLink(Wt::WLink {std::make_unique<DownloadTrackResource>(trackId)});
} }
entry->bindNew<Wt::WPushButton>("download", Wt::WString::tr("Lms.Explore.download"))
->setLink(Wt::WLink {std::make_unique<DownloadTrackResource>(trackId)});
LmsApp->getMediaPlayer().trackLoaded.connect(entryPtr, [=] (Database::TrackId loadedTrackId) LmsApp->getMediaPlayer().trackLoaded.connect(entryPtr, [=] (Database::TrackId loadedTrackId)
{ {
entryPtr->bindString("is-playing", loadedTrackId == trackId ? "Lms-entry-playing" : ""); entryPtr->toggleStyleClass("Lms-entry-playing", loadedTrackId == trackId);
}); });
if (auto trackIdLoaded {LmsApp->getMediaPlayer().getTrackLoaded()}) if (auto trackIdLoaded {LmsApp->getMediaPlayer().getTrackLoaded()})
{ {
entry->bindString("is-playing", *trackIdLoaded == trackId ? "Lms-entry-playing" : ""); entryPtr->toggleStyleClass("Lms-entry-playing", *trackIdLoaded == trackId);
} }
else else
entry->bindString("is-playing", ""); entry->removeStyleClass("Lms-entry-playing");
return entry; return entry;
} }