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

[UI/MOBILE] Condition year, original year, track num and disc num

Browse Source
This commit is contained in:
emeric
2015-11-22 15:33:27 +01:00
parent 963e5911e3
commit fd6627051d
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
approot/templates.xml
+2 -2
View File
@@ -505,7 +505,7 @@
<br/> <br/>
${cover} ${cover}
<br /> <br />
<h4>${release-name} <br/>${artist-name} - ${year}</h4> <h4>${release-name} <br/>${artist-name}${<if-has-year>} - ${year}${</if-has-year>}${<if-has-orig-year>} (${orig-year})${</if-has-orig-year>}</h4>
</div> </div>
<div class="menu row col-md-9"> <div class="menu row col-md-9">
<br/> <br/>
@@ -517,7 +517,7 @@
</message> </message>
<message id="wa-trackview-track"> <message id="wa-trackview-track">
<div class="menu-item list-group-item ">${track-pos}. ${track-name} <span class="badge">${btn}</span><span class="badge">${time}</span></div> <div class="menu-item list-group-item ">${<if-has-disc-num>}${disc-num}-${</if-has-disc-num>}${<if-has-track-num>}${track-num}. ${</if-has-track-num>}${track-name} <span class="badge">${btn}</span><span class="badge">${time}</span></div>
</message> </message>
</messages> </messages>
src/ui/audio/mobile/TrackSearch.cpp
+23 -3
View File
@@ -139,7 +139,19 @@ TrackSearch::addResults(size_t nb)
releaseContainer->bindWidget("cover", cover); releaseContainer->bindWidget("cover", cover);
releaseContainer->bindString("artist-name", getArtistNameFromRelease(release), Wt::PlainText); releaseContainer->bindString("artist-name", getArtistNameFromRelease(release), Wt::PlainText);
releaseContainer->bindString("release-name", release->getName(), Wt::PlainText); releaseContainer->bindString("release-name", release->getName(), Wt::PlainText);
releaseContainer->bindInt("year", release->getReleaseYear()); int year = release->getReleaseYear();
if (year > 0)
{
releaseContainer->setCondition("if-has-year", true);
releaseContainer->bindInt("year", year);
int originalYear = release->getReleaseYear(true);
if (originalYear > 0 && originalYear != year)
{
releaseContainer->setCondition("if-has-orig-year", true);
releaseContainer->bindInt("orig-year", originalYear);
}
}
_currentTrackContainer = new Wt::WContainerWidget(); _currentTrackContainer = new Wt::WContainerWidget();
releaseContainer->bindWidget("track-container", _currentTrackContainer); releaseContainer->bindWidget("track-container", _currentTrackContainer);
@@ -150,8 +162,16 @@ TrackSearch::addResults(size_t nb)
Wt::WTemplate* trackRes = new Wt::WTemplate(_currentTrackContainer); Wt::WTemplate* trackRes = new Wt::WTemplate(_currentTrackContainer);
trackRes->setTemplateText(Wt::WString::tr("wa-trackview-track")); trackRes->setTemplateText(Wt::WString::tr("wa-trackview-track"));
// TODO, do not display track pos for tracks that are not part of a release if (track->getTrackNumber() > 0 && !track->getRelease()->isNone())
trackRes->bindInt("track-pos", track->getTrackNumber()); {
trackRes->setCondition("if-has-track-num", true);
trackRes->bindInt("track-num", track->getTrackNumber());
if (track->getDiscNumber() > 0)
{ trackRes->setCondition("if-has-disc-num", true);
trackRes->bindInt("disc-num", track->getDiscNumber());
}
}
trackRes->bindString("track-name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText); trackRes->bindString("track-name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText);
// TODO, display artist name for compilation releases? // TODO, display artist name for compilation releases?