From e3ffbc70270c568ad6d4d174d80e929073f26fcd Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Sun, 1 Feb 2009 16:35:55 +0100 Subject: [PATCH] align search fields in media library --- src/ncmpcpp.cpp | 16 ++++++++-------- src/search_engine.cpp | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp index b695572f..cd4557ad 100644 --- a/src/ncmpcpp.cpp +++ b/src/ncmpcpp.cpp @@ -1279,35 +1279,35 @@ int main(int argc, char *argv[]) { Statusbar() << fmtBold << "Artist: " << fmtBoldEnd; s.SetArtist(wFooter->GetString(s.GetArtist())); - *mSearcher->Current().first << fmtBold << "Artist:" << fmtBoldEnd << ' ' << ShowTag(s.GetArtist()); + *mSearcher->Current().first << fmtBold << "Artist: " << fmtBoldEnd << ' ' << ShowTag(s.GetArtist()); break; } case 2: { Statusbar() << fmtBold << "Title: " << fmtBoldEnd; s.SetTitle(wFooter->GetString(s.GetTitle())); - *mSearcher->Current().first << fmtBold << "Title:" << fmtBoldEnd << ' ' << ShowTag(s.GetTitle()); + *mSearcher->Current().first << fmtBold << "Title: " << fmtBoldEnd << ' ' << ShowTag(s.GetTitle()); break; } case 3: { Statusbar() << fmtBold << "Album: " << fmtBoldEnd; s.SetAlbum(wFooter->GetString(s.GetAlbum())); - *mSearcher->Current().first << fmtBold << "Album:" << fmtBoldEnd << ' ' << ShowTag(s.GetAlbum()); + *mSearcher->Current().first << fmtBold << "Album: " << fmtBoldEnd << ' ' << ShowTag(s.GetAlbum()); break; } case 4: { Statusbar() << fmtBold << "Filename: " << fmtBoldEnd; s.SetFile(wFooter->GetString(s.GetFile())); - *mSearcher->Current().first << fmtBold << "Filename:" << fmtBoldEnd << ' ' << ShowTag(s.GetFile()); + *mSearcher->Current().first << fmtBold << "Filename: " << fmtBoldEnd << ' ' << ShowTag(s.GetFile()); break; } case 5: { Statusbar() << fmtBold << "Composer: " << fmtBoldEnd; s.SetComposer(wFooter->GetString(s.GetComposer())); - *mSearcher->Current().first << fmtBold << "Composer:" << fmtBoldEnd << ' ' << ShowTag(s.GetComposer()); + *mSearcher->Current().first << fmtBold << "Composer: " << fmtBoldEnd << ' ' << ShowTag(s.GetComposer()); break; } case 6: @@ -1321,21 +1321,21 @@ int main(int argc, char *argv[]) { Statusbar() << fmtBold << "Genre: " << fmtBoldEnd; s.SetGenre(wFooter->GetString(s.GetGenre())); - *mSearcher->Current().first << fmtBold << "Genre:" << fmtBoldEnd << ' ' << ShowTag(s.GetGenre()); + *mSearcher->Current().first << fmtBold << "Genre: " << fmtBoldEnd << ' ' << ShowTag(s.GetGenre()); break; } case 8: { Statusbar() << fmtBold << "Year: " << fmtBoldEnd; s.SetYear(wFooter->GetString(s.GetYear(), 4)); - *mSearcher->Current().first << fmtBold << "Year:" << fmtBoldEnd << ' ' << ShowTag(s.GetYear()); + *mSearcher->Current().first << fmtBold << "Year: " << fmtBoldEnd << ' ' << ShowTag(s.GetYear()); break; } case 9: { Statusbar() << fmtBold << "Comment: " << fmtBoldEnd; s.SetComment(wFooter->GetString(s.GetComment())); - *mSearcher->Current().first << fmtBold << "Comment:" << fmtBoldEnd << ' ' << ShowTag(s.GetComment()); + *mSearcher->Current().first << fmtBold << "Comment: " << fmtBoldEnd << ' ' << ShowTag(s.GetComment()); break; } case 11: diff --git a/src/search_engine.cpp b/src/search_engine.cpp index 671a5fdf..41432e07 100644 --- a/src/search_engine.cpp +++ b/src/search_engine.cpp @@ -88,15 +88,15 @@ void PrepareSearchEngine(Song &s) catch (List::InvalidItem) { } } - *mSearcher->at(0).first << fmtBold << "Artist:" << fmtBoldEnd << ' ' << ShowTag(s.GetArtist()); - *mSearcher->at(1).first << fmtBold << "Title:" << fmtBoldEnd << ' ' << ShowTag(s.GetTitle()); - *mSearcher->at(2).first << fmtBold << "Album:" << fmtBoldEnd << ' ' << ShowTag(s.GetAlbum()); - *mSearcher->at(3).first << fmtBold << "Filename:" << fmtBoldEnd << ' ' << ShowTag(s.GetName()); - *mSearcher->at(4).first << fmtBold << "Composer:" << fmtBoldEnd << ' ' << ShowTag(s.GetComposer()); + *mSearcher->at(0).first << fmtBold << "Artist: " << fmtBoldEnd << ' ' << ShowTag(s.GetArtist()); + *mSearcher->at(1).first << fmtBold << "Title: " << fmtBoldEnd << ' ' << ShowTag(s.GetTitle()); + *mSearcher->at(2).first << fmtBold << "Album: " << fmtBoldEnd << ' ' << ShowTag(s.GetAlbum()); + *mSearcher->at(3).first << fmtBold << "Filename: " << fmtBoldEnd << ' ' << ShowTag(s.GetName()); + *mSearcher->at(4).first << fmtBold << "Composer: " << fmtBoldEnd << ' ' << ShowTag(s.GetComposer()); *mSearcher->at(5).first << fmtBold << "Performer:" << fmtBoldEnd << ' ' << ShowTag(s.GetPerformer()); - *mSearcher->at(6).first << fmtBold << "Genre:" << fmtBoldEnd << ' ' << ShowTag(s.GetGenre()); - *mSearcher->at(7).first << fmtBold << "Year:" << fmtBoldEnd << ' ' << ShowTag(s.GetYear()); - *mSearcher->at(8).first << fmtBold << "Comment:" << fmtBoldEnd << ' ' << ShowTag(s.GetComment()); + *mSearcher->at(6).first << fmtBold << "Genre: " << fmtBoldEnd << ' ' << ShowTag(s.GetGenre()); + *mSearcher->at(7).first << fmtBold << "Year: " << fmtBoldEnd << ' ' << ShowTag(s.GetYear()); + *mSearcher->at(8).first << fmtBold << "Comment: " << fmtBoldEnd << ' ' << ShowTag(s.GetComment()); *mSearcher->at(10).first << fmtBold << "Search in:" << fmtBoldEnd << ' ' << (Config.search_in_db ? "Database" : "Current playlist"); *mSearcher->at(11).first << fmtBold << "Search mode:" << fmtBoldEnd << ' ' << (search_match_to_pattern ? search_mode_normal : search_mode_strict);