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

Updated playqueue to use the new tr message layout

Browse Source
This commit is contained in:
emeric
2018-03-17 17:36:03 +01:00
parent aee3315676
commit 74e0576d31
4 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
approot/messages.xml
+3 -1
View File
@@ -14,7 +14,6 @@
<message id="Lms.password">Password</message>
<message id="Lms.password-confirm">Confirm password</message>
<message id="Lms.passwords-dont-match">Passwords don't match</message>
<message id="Lms.playqueue">Play Queue</message>
<message id="Lms.quit-confirm">Are you sure?</message>
<!--Administration-->
@@ -54,6 +53,9 @@
<message id="Lms.Explore.value">Value</message>
<message id="Lms.Explore.various-artists">Various artists</message>
<!--Playque-->
<message id="Lms.PlayQueue.playqueue">Play Queue</message>
<!--Settings-->
<message id="Lms.Settings.account">Account</message>
<message id="Lms.Settings.audio">Audio</message>
approot/playqueue.xml
+10 -9
View File
@@ -2,37 +2,38 @@
<messages xmlns:if="Wt.WTemplate.conditions">
<!--FORMS message blocks-->
<message id="btn-playqueue-save-btn">
<message id="Lms.PlayQueue.save-to-playlist">
<i class="fa fa-upload"></i>
</message>
<message id="btn-playqueue-load-btn">
<message id="Lms.PlayQueue.load-from-playlist">
<i class="fa fa-download"></i>
</message>
<message id="btn-playqueue-clear-btn">
<message id="Lms.PlayQueue.clear">
<i class="fa fa-times-circle"></i>
</message>
<message id="template-playqueue">
<message id="Lms.PlayQueue.template">
<div class="page-header">
<h2>${tr:Lms.playqueue}</h2>
<h2>${tr:Lms.PlayQueue.playqueue}</h2>
${save-btn} ${load-btn} ${clear-btn}
</div>
${entries}
${show-more}
</message>
<message id="btn-playqueue-entry-play-btn">
<message id="Lms.PlayQueue.play">
<i class="fa fa-play"></i>
</message>
<message id="btn-playqueue-entry-del-btn">
<message id="Lms.PlayQueue.delete">
<i class="fa fa-remove"></i>
</message>
<message id="template-playqueue-entry">
${pos} ${name} ${<if-has-release>}${release-name}${</if-has-release>} ${<if-has-artist>}${artist-name}${</if-has-artist>} ${play-btn} ${del-btn}
<message id="Lms.PlayQueue.template.entry">
${play-btn} ${del-btn}
${name} ${<if-has-release>}${release-name}${</if-has-release>} ${<if-has-artist>}${artist-name}${</if-has-artist>}
</message>
</messages>
src/ui/LmsApplication.cpp
+1 -1
View File
@@ -265,7 +265,7 @@ LmsApplication::handleAuthEvent(void)
menuItem->setSelectable(false);
}
{
auto menuItem = menu->insertItem(3, Wt::WString::tr("Lms.playqueue"));
auto menuItem = menu->insertItem(3, Wt::WString::tr("Lms.PlayQueue.playqueue"));
menuItem->setLink(Wt::WLink(Wt::WLink::InternalPath, "/playqueue"));
menuItem->setSelectable(false);
}
src/ui/PlayQueueView.cpp
+10 -11
View File
@@ -33,22 +33,22 @@ static const std::string currentPlayQueueName = "__current__playqueue__";
PlayQueue::PlayQueue(Wt::WContainerWidget* parent)
: Wt::WContainerWidget(parent)
{
auto container = new Wt::WTemplate(Wt::WString::tr("template-playqueue"), this);
auto container = new Wt::WTemplate(Wt::WString::tr("Lms.PlayQueue.template"), this);
container->addFunction("tr", &Wt::WTemplate::Functions::tr);
auto saveBtn = new Wt::WText(Wt::WString::tr("btn-playqueue-save-btn"), Wt::XHTMLText);
auto saveBtn = new Wt::WText(Wt::WString::tr("Lms.PlayQueue.save-to-playlist"), Wt::XHTMLText);
container->bindWidget("save-btn", saveBtn);
auto loadBtn = new Wt::WText(Wt::WString::tr("btn-playqueue-load-btn"), Wt::XHTMLText);
auto loadBtn = new Wt::WText(Wt::WString::tr("Lms.PlayQueue.load-from-playlist"), Wt::XHTMLText);
container->bindWidget("load-btn", loadBtn);
auto clearBtn = new Wt::WText(Wt::WString::tr("btn-playqueue-clear-btn"), Wt::XHTMLText);
auto clearBtn = new Wt::WText(Wt::WString::tr("Lms.PlayQueue.clear"), Wt::XHTMLText);
container->bindWidget("clear-btn", clearBtn);
_entriesContainer = new Wt::WContainerWidget();
container->bindWidget("entries", _entriesContainer);
_showMore = new Wt::WTemplate(Wt::WString::tr("template-show-more"));
_showMore = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.show-more"));
_showMore->addFunction("tr", &Wt::WTemplate::Functions::tr);
_showMore->setHidden(true);
container->bindWidget("show-more", _showMore);
@@ -123,16 +123,15 @@ PlayQueue::addSome()
auto tracks = playlist->getTracks(_entriesContainer->count(), 50, moreResults);
for (auto track : tracks)
{
Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-playqueue-entry"), _entriesContainer);
Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("Lms.PlayQueue.template.entry"), _entriesContainer);
entry->bindString("pos", std::to_string(_entriesContainer->count()));
entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText);
auto artist = track->getArtist();
if (artist)
{
entry->setCondition("if-has-artist", true);
Wt::WAnchor *artistAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/artist/" + std::to_string(track->getArtist().id())));
Wt::WAnchor *artistAnchor = LmsApplication::createArtistAnchor(track->getArtist().id());
Wt::WText *artistText = new Wt::WText(artistAnchor);
artistText->setText(Wt::WString::fromUTF8(artist->getName(), Wt::PlainText));
entry->bindWidget("artist-name", artistAnchor);
@@ -141,17 +140,17 @@ PlayQueue::addSome()
if (release)
{
entry->setCondition("if-has-release", true);
Wt::WAnchor *releaseAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(track->getRelease().id())));
Wt::WAnchor *releaseAnchor = LmsApplication::createReleaseAnchor(track->getRelease().id());
Wt::WText *releaseText = new Wt::WText(releaseAnchor);
releaseText->setText(Wt::WString::fromUTF8(release->getName(), Wt::PlainText));
entry->bindWidget("release-name", releaseAnchor);
}
auto playBtn = new Wt::WText(Wt::WString::tr("btn-playqueue-entry-play-btn"), Wt::XHTMLText);
auto playBtn = new Wt::WText(Wt::WString::tr("Lms.PlayQueue.play"), Wt::XHTMLText);
entry->bindWidget("play-btn", playBtn);
// TODO
auto addBtn = new Wt::WText(Wt::WString::tr("btn-playqueue-entry-del-btn"), Wt::XHTMLText);
auto addBtn = new Wt::WText(Wt::WString::tr("Lms.PlayQueue.delete"), Wt::XHTMLText);
entry->bindWidget("del-btn", addBtn);
// TODO
}