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

Still converting to bootstrap 5, removed all old js

Browse Source
This commit is contained in:
emeric
2022-03-30 20:22:48 +02:00
parent 4c74ad3663
commit 682922bfe5
11 changed files with 43 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lms/ui/LmsApplication.cpp
+1
View File
@@ -492,6 +492,7 @@ LmsApplication::createHome()
// Contents
// Order is important in mainStack, see IdxRoot!
Wt::WStackedWidget* mainStack {main->bindNew<Wt::WStackedWidget>("contents")};
mainStack->setOverflow(Wt::Overflow::Visible); // wt makes it hidden by default
Explore* explore {mainStack->addNew<Explore>(filters)};
_playQueue = mainStack->addNew<PlayQueue>();
src/lms/ui/explore/ArtistListHelpers.cpp
-10
View File
@@ -33,15 +33,5 @@ namespace UserInterface::ArtistListHelpers
return res;
}
std::unique_ptr<Wt::WTemplate>
createEntrySmall(const Database::ObjectPtr<Database::Artist>& artist)
{
auto res {std::make_unique<Wt::WTemplate>(Wt::WString::tr("Lms.Explore.Artists.template.entry-small"))};
res->bindWidget("name", LmsApplication::createArtistAnchor(artist));
return res;
}
}
src/lms/ui/explore/ArtistListHelpers.hpp
-1
View File
@@ -33,6 +33,5 @@ namespace Database
namespace UserInterface::ArtistListHelpers
{
std::unique_ptr<Wt::WTemplate> createEntry(const Database::ObjectPtr<Database::Artist>& artist);
std::unique_ptr<Wt::WTemplate> createEntrySmall(const Database::ObjectPtr<Database::Artist>& artist);
}
src/lms/ui/explore/ArtistView.cpp
+1 -1
View File
@@ -230,7 +230,7 @@ Artist::refreshSimilarArtists(const std::vector<ArtistId>& similarArtistsId)
if (!similarArtist)
continue;
similarArtistsContainer->addWidget(ArtistListHelpers::createEntrySmall(similarArtist));
similarArtistsContainer->addWidget(ArtistListHelpers::createEntry(similarArtist));
}
}
src/lms/ui/explore/ArtistsView.cpp
+8 -5
View File
@@ -152,13 +152,16 @@ Artists::refreshArtistLinkTypes()
void
Artists::addSome()
{
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
const auto artistIds {_artistCollector.get(Range {static_cast<std::size_t>(_container->getCount()), _batchSize})};
for (const ArtistId artistId : artistIds.results)
{
if (const auto artist {Artist::find(LmsApp->getDbSession(), artistId)})
_container->add(ArtistListHelpers::createEntry(artist));
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
for (const ArtistId artistId : artistIds.results)
{
if (const auto artist {Artist::find(LmsApp->getDbSession(), artistId)})
_container->add(ArtistListHelpers::createEntry(artist));
}
}
_container->setHasMore(artistIds.moreResults);
src/lms/ui/explore/Explore.cpp
+3 -1
View File
@@ -85,7 +85,8 @@ Explore::Explore(Filters* filters)
addFunction("tr", &Functions::tr);
// Contents
Wt::WStackedWidget* contentsStack = bindNew<Wt::WStackedWidget>("contents");
Wt::WStackedWidget* contentsStack {bindNew<Wt::WStackedWidget>("contents")};
contentsStack->setOverflow(Wt::Overflow::Visible); // wt makes it hidden by default
auto artists = std::make_unique<Artists>(*_filters);
contentsStack->addWidget(std::move(artists));
@@ -157,6 +158,7 @@ getReleasesTracks(Database::Session& session, const std::vector<Database::Releas
{
std::vector<Database::TrackId> res;
// TODO optimize this
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
for (const Database::ReleaseId releaseId : releasesId)
src/lms/ui/explore/ReleasesView.cpp
+8 -5
View File
@@ -116,13 +116,16 @@ Releases::refreshView(ReleaseCollector::Mode mode)
void
Releases::addSome()
{
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
const auto releaseIds {_releaseCollector.get(Range {static_cast<std::size_t>(_container->getCount()), _batchSize})};
for (const ReleaseId releaseId : releaseIds.results)
{
if (const Release::pointer release {Release::find(LmsApp->getDbSession(), releaseId)})
_container->add(ReleaseListHelpers::createEntry(release));
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
for (const ReleaseId releaseId : releaseIds.results)
{
if (const Release::pointer release {Release::find(LmsApp->getDbSession(), releaseId)})
_container->add(ReleaseListHelpers::createEntry(release));
}
}
_container->setHasMore(releaseIds.moreResults);
src/lms/ui/explore/SearchView.cpp
+22 -15
View File
@@ -138,14 +138,17 @@ namespace UserInterface
{
using namespace Database;
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
const Range range {results.getCount(), getBatchSize(Mode::Artist)};
const RangeResults<ArtistId> artistIds {_artistCollector.get(range)};
for (const ArtistId artistId : artistIds.results)
{
const Artist::pointer artist {Artist::find(LmsApp->getDbSession(), artistId)};
results.add(ArtistListHelpers::createEntry(artist));
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
for (const ArtistId artistId : artistIds.results)
{
const Artist::pointer artist {Artist::find(LmsApp->getDbSession(), artistId)};
results.add(ArtistListHelpers::createEntry(artist));
}
}
results.setHasMore(artistIds.moreResults);
@@ -162,15 +165,17 @@ namespace UserInterface
{
using namespace Database;
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
const Range range {results.getCount(), getBatchSize(Mode::Release)};
const RangeResults<ReleaseId> releaseIds {_releaseCollector.get(range)};
for (const ReleaseId releaseId : releaseIds.results)
{
const Release::pointer release {Release::find(LmsApp->getDbSession(), releaseId)};
results.add(ReleaseListHelpers::createEntry(release));
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
for (const ReleaseId releaseId : releaseIds.results)
{
const Release::pointer release {Release::find(LmsApp->getDbSession(), releaseId)};
results.add(ReleaseListHelpers::createEntry(release));
}
}
results.setHasMore(releaseIds.moreResults);
@@ -186,15 +191,17 @@ namespace UserInterface
{
using namespace Database;
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
const Range range {results.getCount(), getBatchSize(Mode::Track)};
const RangeResults<TrackId> trackIds {_trackCollector.get(range)};
for (const TrackId trackId : trackIds.results)
{
const Track::pointer track {Track::find(LmsApp->getDbSession(), trackId)};
results.add(TrackListHelpers::createEntry(track, tracksAction));
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
for (const TrackId trackId : trackIds.results)
{
const Track::pointer track {Track::find(LmsApp->getDbSession(), trackId)};
results.add(TrackListHelpers::createEntry(track, tracksAction));
}
}
results.setHasMore(trackIds.moreResults);