diff --git a/approot/artist.xml b/approot/artist.xml index 47372a71..2b3f5730 100644 --- a/approot/artist.xml +++ b/approot/artist.xml @@ -6,20 +6,18 @@

${name}

${clusters class="mb-2"} -
- ${play-btn class="btn btn-primary me-2"} -
- ${more-btn class="btn btn-primary" data-bs-toggle="dropdown" aria-expanded="false"} -
    -
  • ${play-shuffled class="btn dropdown-item"}
    • -
  • ${play-last class="btn dropdown-item"}
    • -
  • ${star class="btn dropdown-item"}
    • - ${} -
  • ${tr:Lms.Explore.musicbrainz-artist}
    • - ${    } -
  • ${download class="btn dropdown-item"}
    • -
-
+
+ ${play-btn class="btn btn-primary"} +
${} diff --git a/approot/artists.xml b/approot/artists.xml index 6b566a2c..a0fd6409 100644 --- a/approot/artists.xml +++ b/approot/artists.xml @@ -4,7 +4,7 @@
-
    +
    • ${random class="nav-link"}
      • diff --git a/approot/mediaplayer.xml b/approot/mediaplayer.xml index 1a939636..5f268905 100644 --- a/approot/mediaplayer.xml +++ b/approot/mediaplayer.xml @@ -15,13 +15,13 @@
      - -
      diff --git a/approot/messages.xml b/approot/messages.xml index 56a6daa8..0acf1da1 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -121,6 +121,7 @@ Most played MusicBrainz Artist MusicBrainz Release +Play Play last Play shuffled Random diff --git a/approot/messages_fr.xml b/approot/messages_fr.xml index 345b5cdd..b4572718 100644 --- a/approot/messages_fr.xml +++ b/approot/messages_fr.xml @@ -121,6 +121,7 @@ Plus joués MusicBrainz Artist MusicBrainz Release +Jouer Jouer en dernier Jouer aléatoirement Aléatoire diff --git a/approot/messages_it.xml b/approot/messages_it.xml index 230ae011..b8648405 100644 --- a/approot/messages_it.xml +++ b/approot/messages_it.xml @@ -120,6 +120,7 @@ Più ascoltati Artista MusicBrainz Album MusicBrainz + Aggiungi alla coda di riproduzione Aggiungi alla coda di riproduzione mischiando Casuali diff --git a/approot/messages_zh.xml b/approot/messages_zh.xml index 46f10ddd..fca04e46 100644 --- a/approot/messages_zh.xml +++ b/approot/messages_zh.xml @@ -121,6 +121,7 @@ 播放最多 MusicBrainz 歌手 MusicBrainz 专辑 + 播放列表 随机播放 随机 diff --git a/approot/release.xml b/approot/release.xml index 632b79f9..d964b8c2 100644 --- a/approot/release.xml +++ b/approot/release.xml @@ -17,23 +17,21 @@ ${}
      ${tr:Lms.Explore.various-artists}
      ${      }
      ${}${year}${} (${orig-year})${} · ${}${duration}
      ${clusters class="mb-2"} +
      + ${play-btn class="btn btn-primary"} +
      -
      - ${play-btn class="btn btn-primary me-2"} -
      - ${more-btn class="btn btn-primary" data-bs-toggle="dropdown" aria-expanded="false"} -
        -
      • ${play-shuffled class="btn dropdown-item"}
        • -
      • ${play-last class="btn dropdown-item"}
        • -
      • ${star class="btn dropdown-item"}
        • - ${} -
      • ${tr:Lms.Explore.musicbrainz-release}
        • - ${        } -
      • ${download class="btn dropdown-item"}
        • -
      -
      -
      ${container class="d-grid gap-3"} ${}
      ${copyright class="text-reset"}
      diff --git a/approot/releases.xml b/approot/releases.xml index 5f6fc6a6..859c8735 100644 --- a/approot/releases.xml +++ b/approot/releases.xml @@ -24,15 +24,13 @@ ${all class="nav-link"}
    -
    - ${play-btn class="btn btn-primary me-2"} -
    - ${more-btn data-bs-toggle="dropdown" aria-expanded="false" class="btn btn-primary"} -
      -
    • ${play-last class="btn dropdown-item"}
      • -
    • ${play-shuffled class="btn dropdown-item"}
      • -
    -
    +
    + ${play-btn class="btn btn-primary"} +
    ${releases} diff --git a/approot/tracks.xml b/approot/tracks.xml index 9a1873ce..38e6f482 100644 --- a/approot/tracks.xml +++ b/approot/tracks.xml @@ -25,15 +25,13 @@ ${all class="nav-link"}
-
- ${play-btn class="btn btn-primary me-2"} -
- ${more-btn data-bs-toggle="dropdown" aria-expanded="false" class="btn btn-primary"} -
    -
  • ${play-last class="btn dropdown-item"}
    • -
  • ${play-shuffled class="btn dropdown-item"}
    • -
-
+
+ ${play-btn class="btn btn-primary"} +
${tracks} diff --git a/src/lms/ui/explore/ArtistView.cpp b/src/lms/ui/explore/ArtistView.cpp index c53c3247..4d6212ab 100644 --- a/src/lms/ui/explore/ArtistView.cpp +++ b/src/lms/ui/explore/ArtistView.cpp @@ -138,8 +138,7 @@ Artist::refreshView() bindString("name", Wt::WString::fromUTF8(artist->getName()), Wt::TextFormat::Plain); - bindNew("more-btn", Wt::WString::tr("Lms.Explore.template.more-btn"), Wt::TextFormat::XHTML); - bindNew("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML) + bindNew("play-btn", Wt::WString::tr("Lms.Explore.play"), Wt::TextFormat::XHTML) ->clicked().connect([=] { artistsAction.emit(PlayQueueAction::Play, {_artistId}); diff --git a/src/lms/ui/explore/ReleaseView.cpp b/src/lms/ui/explore/ReleaseView.cpp index ef67908d..824e5027 100644 --- a/src/lms/ui/explore/ReleaseView.cpp +++ b/src/lms/ui/explore/ReleaseView.cpp @@ -151,8 +151,7 @@ Release::refreshView() } } - bindNew("more-btn", Wt::WString::tr("Lms.Explore.template.more-btn"), Wt::TextFormat::XHTML); - bindNew("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML) + bindNew("play-btn", Wt::WString::tr("Lms.Explore.play"), Wt::TextFormat::XHTML) ->clicked().connect([=] { releasesAction.emit(PlayQueueAction::Play, {*releaseId}); diff --git a/src/lms/ui/explore/ReleasesView.cpp b/src/lms/ui/explore/ReleasesView.cpp index 7fc62e54..8ada8c37 100644 --- a/src/lms/ui/explore/ReleasesView.cpp +++ b/src/lms/ui/explore/ReleasesView.cpp @@ -66,13 +66,12 @@ Releases::Releases(Filters& filters) bindMenuItem("recently-added", Wt::WString::tr("Lms.Explore.recently-added"), ReleaseCollector::Mode::RecentlyAdded); bindMenuItem("all", Wt::WString::tr("Lms.Explore.all"), ReleaseCollector::Mode::All); - Wt::WPushButton* playBtn {bindNew("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML)}; + Wt::WPushButton* playBtn {bindNew("play-btn", Wt::WString::tr("Lms.Explore.play"), Wt::TextFormat::XHTML)}; playBtn->clicked().connect([this] { releasesAction.emit(PlayQueueAction::Play, getAllReleases()); }); - bindNew("more-btn", Wt::WString::tr("Lms.Explore.template.more-btn"), Wt::TextFormat::XHTML); bindNew("play-shuffled", Wt::WString::tr("Lms.Explore.play-shuffled"), Wt::TextFormat::Plain) ->clicked().connect([=] { diff --git a/src/lms/ui/explore/TracksView.cpp b/src/lms/ui/explore/TracksView.cpp index 732b0fb4..9ef7998f 100644 --- a/src/lms/ui/explore/TracksView.cpp +++ b/src/lms/ui/explore/TracksView.cpp @@ -66,13 +66,12 @@ _trackCollector {filters, _defaultMode, _maxCount} bindMenuItem("recently-added", Wt::WString::tr("Lms.Explore.recently-added"), TrackCollector::Mode::RecentlyAdded); bindMenuItem("all", Wt::WString::tr("Lms.Explore.all"), TrackCollector::Mode::All); - bindNew("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML) + bindNew("play-btn", Wt::WString::tr("Lms.Explore.play"), Wt::TextFormat::XHTML) ->clicked().connect([=] { tracksAction.emit(PlayQueueAction::Play, getAllTracks()); }); - bindNew("more-btn", Wt::WString::tr("Lms.Explore.template.more-btn"), Wt::TextFormat::XHTML); bindNew("play-shuffled", Wt::WString::tr("Lms.Explore.play-shuffled"), Wt::TextFormat::Plain) ->clicked().connect([=] {