normalize messages

master
Andrzej Rybczak 12 years ago
parent 9e8dc741e5
commit d20765c53a
  1. 12
      src/actions.cpp
  2. 2
      src/browser.cpp
  3. 2
      src/lyrics.cpp
  4. 2
      src/media_library.cpp
  5. 2
      src/mpdpp.cpp
  6. 2
      src/visualizer.cpp

@ -1098,7 +1098,7 @@ void ToggleSeparatorsBetweenAlbums::run()
{ {
Config.playlist_separate_albums = !Config.playlist_separate_albums; Config.playlist_separate_albums = !Config.playlist_separate_albums;
Statusbar::printf("Separators between albums: %1%", Statusbar::printf("Separators between albums: %1%",
Config.playlist_separate_albums ? "On" : "Off" Config.playlist_separate_albums ? "on" : "off"
); );
} }
@ -1128,7 +1128,7 @@ void ToggleFetchingLyricsInBackground::run()
# ifdef HAVE_CURL_CURL_H # ifdef HAVE_CURL_CURL_H
Config.fetch_lyrics_in_background = !Config.fetch_lyrics_in_background; Config.fetch_lyrics_in_background = !Config.fetch_lyrics_in_background;
Statusbar::printf("Fetching lyrics for playing songs in background: %1%", Statusbar::printf("Fetching lyrics for playing songs in background: %1%",
Config.fetch_lyrics_in_background ? "On" : "Off" Config.fetch_lyrics_in_background ? "on" : "off"
); );
# endif // HAVE_CURL_CURL_H # endif // HAVE_CURL_CURL_H
} }
@ -1137,7 +1137,7 @@ void TogglePlayingSongCentering::run()
{ {
Config.autocenter_mode = !Config.autocenter_mode; Config.autocenter_mode = !Config.autocenter_mode;
Statusbar::printf("Centering playing song: %1%", Statusbar::printf("Centering playing song: %1%",
Config.autocenter_mode ? "On" : "Off" Config.autocenter_mode ? "on" : "off"
); );
if (Config.autocenter_mode if (Config.autocenter_mode
&& Status::State::player() != MPD::psStop && Status::State::player() != MPD::psStop
@ -1973,7 +1973,7 @@ void ToggleReplayGainMode::run()
void ToggleSpaceMode::run() void ToggleSpaceMode::run()
{ {
Config.space_selects = !Config.space_selects; Config.space_selects = !Config.space_selects;
Statusbar::printf("Space mode: %1% item", Config.space_selects ? "Select" : "Add"); Statusbar::printf("Space mode: %1% item", Config.space_selects ? "select" : "add");
} }
void ToggleAddMode::run() void ToggleAddMode::run()
@ -1983,11 +1983,11 @@ void ToggleAddMode::run()
{ {
case SpaceAddMode::AddRemove: case SpaceAddMode::AddRemove:
Config.space_add_mode = SpaceAddMode::AlwaysAdd; Config.space_add_mode = SpaceAddMode::AlwaysAdd;
mode_desc = "Always add an item to playlist"; mode_desc = "always add an item to playlist";
break; break;
case SpaceAddMode::AlwaysAdd: case SpaceAddMode::AlwaysAdd:
Config.space_add_mode = SpaceAddMode::AddRemove; Config.space_add_mode = SpaceAddMode::AddRemove;
mode_desc = "Add an item to playlist or remove if already added"; mode_desc = "add an item to playlist or remove if already added";
break; break;
} }
Statusbar::printf("Add mode: %1%", mode_desc); Statusbar::printf("Add mode: %1%", mode_desc);

@ -546,7 +546,7 @@ void Browser::ChangeBrowseMode()
itsBrowseLocally = !itsBrowseLocally; itsBrowseLocally = !itsBrowseLocally;
Statusbar::printf("Browse mode: %1%", Statusbar::printf("Browse mode: %1%",
itsBrowseLocally ? "Local filesystem" : "MPD database" itsBrowseLocally ? "local filesystem" : "MPD database"
); );
if (itsBrowseLocally) if (itsBrowseLocally)
{ {

@ -141,7 +141,7 @@ void Lyrics::spacePressed()
{ {
Config.now_playing_lyrics = !Config.now_playing_lyrics; Config.now_playing_lyrics = !Config.now_playing_lyrics;
Statusbar::printf("Reload lyrics if song changes: %1%", Statusbar::printf("Reload lyrics if song changes: %1%",
Config.now_playing_lyrics ? "On" : "Off" Config.now_playing_lyrics ? "on" : "off"
); );
} }

@ -894,7 +894,7 @@ void MediaLibrary::toggleSortMode()
{ {
Config.media_library_sort_by_mtime = !Config.media_library_sort_by_mtime; Config.media_library_sort_by_mtime = !Config.media_library_sort_by_mtime;
Statusbar::printf("Sorting library by: %1%", Statusbar::printf("Sorting library by: %1%",
Config.media_library_sort_by_mtime ? "Modification time" : "Name"); Config.media_library_sort_by_mtime ? "modification time" : "name");
if (hasTwoColumns) if (hasTwoColumns)
{ {
std::sort(Albums.beginV(), Albums.endV(), SortAlbumEntries()); std::sort(Albums.beginV(), Albums.endV(), SortAlbumEntries());

@ -394,8 +394,6 @@ std::string Connection::GetReplayGainMode()
if (mpd_pair *pair = mpd_recv_pair_named(m_connection, "replay_gain_mode")) if (mpd_pair *pair = mpd_recv_pair_named(m_connection, "replay_gain_mode"))
{ {
result = pair->value; result = pair->value;
if (!result.empty())
result[0] = toupper(result[0]);
mpd_return_pair(m_connection, pair); mpd_return_pair(m_connection, pair);
} }
mpd_response_finish(m_connection); mpd_response_finish(m_connection);

@ -132,7 +132,7 @@ void Visualizer::spacePressed()
# ifdef HAVE_FFTW3_H # ifdef HAVE_FFTW3_H
Config.visualizer_use_wave = !Config.visualizer_use_wave; Config.visualizer_use_wave = !Config.visualizer_use_wave;
Statusbar::printf("Visualization type: %1%", Statusbar::printf("Visualization type: %1%",
Config.visualizer_use_wave ? "Sound wave" : "Frequency spectrum" Config.visualizer_use_wave ? "sound wave" : "frequency spectrum"
); );
# endif // HAVE_FFTW3_H # endif // HAVE_FFTW3_H
} }

Loading…
Cancel
Save