mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-10-02 04:52:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added retry logic to LyricsLayout.

Browse Source
This commit is contained in:
casey langen 2019-04-07 22:06:43 -07:00
parent eff4abe65a
commit 03703a38a8
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/musikcube/app/layout/LyricsLayout.cpp
View File

@ -82,6 +82,10 @@ void LyricsLayout::OnTrackChanged(size_t index, TrackPtr track) {
}
bool LyricsLayout::KeyPress(const std::string& kn) {
if (Hotkeys::Is(Hotkeys::LyricsRetry, kn)) {
this->LoadLyricsForCurrentTrack();
return true;
}
return LayoutBase::KeyPress(kn);
}
@ -148,7 +152,9 @@ void LyricsLayout::SetState(State state) {
case State::Failed: {
this->listView->Hide();
this->infoText->Show();
this->infoText->SetText(_TSTR("lyrics_lookup_failed"));
this->infoText->SetText(u8fmt(
_TSTR("lyrics_lookup_failed"),
Hotkeys::Get(Hotkeys::LyricsRetry).c_str()));
this->currentTrackId = -1LL;
}
break;

4
src/musikcube/app/util/Hotkeys.cpp
View File

@ -98,6 +98,8 @@ static std::unordered_map<std::string, Id> NAME_TO_ID = {
{ "browse_playlists_rename", Id::BrowsePlaylistsRename },
{ "browse_playlists_delete", Id::BrowsePlaylistsDelete },
{ "lyrics_retry", Id::LyricsRetry },
{ "playback_toggle_mute", Id::ToggleMute },
{ "playback_toggle_pause", Id::TogglePause },
{ "playback_next", Id::Next },
@ -182,6 +184,8 @@ static std::unordered_map<Id, std::string, EnumHasher> ID_TO_DEFAULT = {
{ Id::BrowsePlaylistsDelete, "KEY_DC" },
#endif
{ Id::LyricsRetry, "r" },
{ Id::ToggleMute, "m" },
{ Id::TogglePause, "^P" },
{ Id::Next, "l" },

3
src/musikcube/app/util/Hotkeys.h
View File

@ -108,6 +108,9 @@ namespace musik {
BrowsePlaylistsRename,
BrowsePlaylistsDelete,
/* lyrics */
LyricsRetry,
/* indexer */
RescanMetadata,

2
src/musikcube/data/locales/en_US.json
View File

@ -207,7 +207,7 @@
"lyrics_list_title": "lyrics for '%s'",
"lyrics_not_playing": "nothing is currently playing!",
"lyrics_loading": "looking up lyrics...",
"lyrics_lookup_failed": "lyrics lookup failed. press 'r' to retry.",
"lyrics_lookup_failed": "lyrics lookup failed. press '%s' to retry.",
"update_check_dialog_title": "new version available!",
"update_check_dialog_message": "musikcube version %s is now available for download. a changelog and binaries are available at:\n\n%s",