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

Removed the play/add buttons on artist/releases view to make the UI cleaner

Browse Source
This commit is contained in:
emeric
2020-05-17 11:06:48 +02:00
parent 6b9bbb2788
commit da059e7bfc
7 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
approot/artist.xml
-1
View File
@@ -43,7 +43,6 @@
</h4> </h4>
${<if-has-artist>}<h4><small>${artist class="Lms-artistname text-muted"}</small></h4>${</if-has-artist>} ${<if-has-artist>}<h4><small>${artist class="Lms-artistname text-muted"}</small></h4>${</if-has-artist>}
<h4><small><div class="text-muted">${<if-has-year>}${year}${</if-has-year>}${<if-has-orig-year>} (${orig-year})${</if-has-orig-year>}</div></small></h4> <h4><small><div class="text-muted">${<if-has-year>}${year}${</if-has-year>}${<if-has-orig-year>} (${orig-year})${</if-has-orig-year>}</div></small></h4>
${play-btn}${add-btn}
</div> </div>
</div> </div>
</div> </div>
approot/explore.xml
+2 -2
View File
@@ -5,8 +5,8 @@
${contents class="Lms-explore-contents"} ${contents class="Lms-explore-contents"}
</message> </message>
<message id="Lms.Explore.template.add-btn"><i class="fa fa-plus-circle Lms-explore-btn Lms-control-btn"></i></message> <message id="Lms.Explore.template.add-btn"><i class="fa fa-fw fa-plus-circle Lms-explore-btn Lms-control-btn"></i></message>
<message id="Lms.Explore.template.play-btn"><i class="fa fa-play-circle Lms-explore-btn Lms-control-btn"></i></message> <message id="Lms.Explore.template.play-btn"><i class="fa fa-fw fa-play-circle Lms-explore-btn Lms-control-btn"></i></message>
<message id="Lms.Explore.template.filters"> <message id="Lms.Explore.template.filters">
${add-filter class="btn-sm btn-info"} ${clusters class="Lms-explore-clusters"} ${add-filter class="btn-sm btn-info"} ${clusters class="Lms-explore-clusters"}
approot/mediaplayer.xml
+1 -1
View File
@@ -35,7 +35,7 @@
</div> </div>
</div> </div>
<div class="hidden-xs col-sm-2 Lms-player-duration text-muted"> <div class="hidden-xs col-sm-2 Lms-player-duration text-muted">
<a id="lms-transcoding-active" class="Lms-player-btn Lms-control-btn" data-toggle="tooltip" title="${tr:Lms.Player.transcoding-active}" style="display:none"><i class="fa fa-fw fa-info-circle" aria-hidden="true"></i></a> <a id="lms-transcoding-active" class="Lms-player-btn Lms-control-btn" data-toggle="tooltip" title="${tr:Lms.Player.transcoding-active}" style="visibility:hidden"><i class="fa fa-fw fa-info-circle" aria-hidden="true"></i></a>
<span id="lms-mp-curtime">--</span> / <span id="lms-mp-duration">--</span> <span id="lms-mp-curtime">--</span> / <span id="lms-mp-duration">--</span>
</div> </div>
</div> </div>
approot/releases.xml
-1
View File
@@ -27,7 +27,6 @@
${release-name class="Lms-releasename text-primary"} ${release-name class="Lms-releasename text-primary"}
</h4> </h4>
${<if-has-artist>}<h4><small>${artist-name class="Lms-artistname text-muted"}</small></h4>${</if-has-artist>} ${<if-has-artist>}<h4><small>${artist-name class="Lms-artistname text-muted"}</small></h4>${</if-has-artist>}
${play-btn}${add-btn}
</div> </div>
</div> </div>
</div> </div>
src/lms/ui/explore/ArtistView.cpp
-14
View File
@@ -135,8 +135,6 @@ Artist::refreshView()
std::unique_ptr<Wt::WTemplate> std::unique_ptr<Wt::WTemplate>
Artist::createRelease(const Database::Artist::pointer& artist, const Release::pointer& release) Artist::createRelease(const Database::Artist::pointer& artist, const Release::pointer& release)
{ {
auto releaseId = release.id();
auto entry = std::make_unique<Wt::WTemplate>(Wt::WString::tr("Lms.Explore.Artist.template.entry")); auto entry = std::make_unique<Wt::WTemplate>(Wt::WString::tr("Lms.Explore.Artist.template.entry"));
entry->addFunction("tr", Wt::WTemplate::Functions::tr); entry->addFunction("tr", Wt::WTemplate::Functions::tr);
@@ -182,18 +180,6 @@ Artist::createRelease(const Database::Artist::pointer& artist, const Release::po
} }
} }
Wt::WText* playBtn = entry->bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML);
playBtn->clicked().connect([=]
{
releasesAction.emit(PlayQueueAction::Play, {releaseId});
});
Wt::WText* addBtn = entry->bindNew<Wt::WText>("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML);
addBtn->clicked().connect([=]
{
releasesAction.emit(PlayQueueAction::AddLast, {releaseId});
});
return entry; return entry;
} }
src/lms/ui/explore/ArtistView.hpp
-1
View File
@@ -43,7 +43,6 @@ class Artist : public Wt::WTemplate
Artist(Filters* filters); Artist(Filters* filters);
Wt::Signal<PlayQueueAction, const std::vector<Database::IdType>&> artistsAction; Wt::Signal<PlayQueueAction, const std::vector<Database::IdType>&> artistsAction;
Wt::Signal<PlayQueueAction, const std::vector<Database::IdType>&> releasesAction;
private: private:
void refreshView(); void refreshView();
src/lms/ui/explore/Explore.cpp
-1
View File
@@ -89,7 +89,6 @@ Explore::Explore(Filters* filters)
auto artist = std::make_unique<Artist>(_filters); auto artist = std::make_unique<Artist>(_filters);
artist->artistsAction.connect(this, &Explore::handleArtistsAction); artist->artistsAction.connect(this, &Explore::handleArtistsAction);
artist->releasesAction.connect(this, &Explore::handleReleasesAction);
contentsStack->addWidget(std::move(artist)); contentsStack->addWidget(std::move(artist));
auto releases = std::make_unique<Releases>(_filters); auto releases = std::make_unique<Releases>(_filters);