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

[UI/MOBILE] Handling year in release

Browse Source
This commit is contained in:
emeric
2015-11-22 15:01:00 +01:00
parent fc88cce33e
commit 963e5911e3
4 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/audio/mobile/MobileAudio.cpp
+8 -6
View File
@@ -36,6 +36,8 @@
#include "MobileAudio.hpp"
#define SEARCH_NB_ITEMS 4
namespace UserInterface {
namespace Mobile {
@@ -93,9 +95,9 @@ Audio::Audio(Wt::WContainerWidget *parent)
// Song
std::vector<std::string> keywords = splitStrings(edit->text().toUTF8(), " ");;
releaseSearch->search(SearchFilter::ByName(SearchFilter::Field::Release, keywords), 4);
artistSearch->search(SearchFilter::ByName(SearchFilter::Field::Artist, keywords), 4);
trackSearch->search(SearchFilter::ByName(SearchFilter::Field::Track, keywords), 4);
releaseSearch->search(SearchFilter::ByName(SearchFilter::Field::Release, keywords), SEARCH_NB_ITEMS);
artistSearch->search(SearchFilter::ByName(SearchFilter::Field::Artist, keywords), SEARCH_NB_ITEMS);
trackSearch->search(SearchFilter::ByName(SearchFilter::Field::Track, keywords), SEARCH_NB_ITEMS);
artistSearch->show();
releaseSearch->show();
@@ -175,9 +177,9 @@ Audio::Audio(Wt::WContainerWidget *parent)
// Initially, populate the widgets using an empty search
{
artistSearch->search(SearchFilter(), 3);
releaseSearch->search(SearchFilter(), 3);
trackSearch->search(SearchFilter(), 3);
artistSearch->search(SearchFilter(), SEARCH_NB_ITEMS);
releaseSearch->search(SearchFilter(), SEARCH_NB_ITEMS);
trackSearch->search(SearchFilter(), SEARCH_NB_ITEMS);
}
}
src/ui/audio/mobile/TrackSearch.cpp
+6 -8
View File
@@ -54,6 +54,10 @@ TrackSearch::TrackSearch(Wt::WContainerWidget *parent)
_showMore->setTemplateText(Wt::WString::tr("mobile-search-more"));
_showMore->bindString("text", "Tap to show more results...");
_showMore->hide();
_showMore->clicked().connect(std::bind([=] {
_sigMoreTracksSelected();
addResults(20);
}));
}
void
@@ -133,9 +137,9 @@ TrackSearch::addResults(size_t nb)
cover->setImageLink(Wt::WLink (LmsApplication::instance()->getCoverResource()->getReleaseUrl(release.id(), 512)));
releaseContainer->bindWidget("cover", cover);
releaseContainer->bindString("artist-name", getArtistNameFromRelease(release));
releaseContainer->bindString("artist-name", getArtistNameFromRelease(release), Wt::PlainText);
releaseContainer->bindString("release-name", release->getName(), Wt::PlainText);
releaseContainer->bindInt("year", 2001);
releaseContainer->bindInt("year", release->getReleaseYear());
_currentTrackContainer = new Wt::WContainerWidget();
releaseContainer->bindWidget("track-container", _currentTrackContainer);
@@ -165,13 +169,7 @@ TrackSearch::addResults(size_t nb)
}
if (moreResults)
{
_showMore->clicked().connect(std::bind([=] {
_sigMoreTracksSelected();
addResults(20);
}));
_showMore->show();
}
else
_showMore->hide();
}