Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes for db97a1a318

Browse Source
This commit is contained in:
Andrzej Rybczak
2010-01-31 16:28:00 +01:00
parent db97a1a318
commit d1194757a0
2 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/help.cpp
View File

@@ -259,7 +259,7 @@ void Help::GetKeybindings()
*w << "\n\n " << fmtBold << "Keys - Media library\n -----------------------------------------\n" << fmtBoldEnd; *w << "\n\n " << fmtBold << "Keys - Media library\n -----------------------------------------\n" << fmtBoldEnd;
if (!Config.media_library_disable_two_column_mode) if (!Config.media_library_disable_two_column_mode)
*w << DisplayKeys(Key.MediaLibrary) << "Switch between two/three columns\n"; *w << DisplayKeys(Key.MediaLibrary) << "Switch between two/three columns\n";
*w << DisplayKeys(&Key.VolumeDown[0], 1) << "Previous column\n"; *w << DisplayKeys(&Key.VolumeDown[0], 1) << "Previous column\n";
*w << DisplayKeys(&Key.VolumeUp[0], 1) << "Next column\n"; *w << DisplayKeys(&Key.VolumeUp[0], 1) << "Next column\n";
*w << DisplayKeys(Key.Enter) << "Add to playlist and play song/album/artist's songs\n"; *w << DisplayKeys(Key.Enter) << "Add to playlist and play song/album/artist's songs\n";

37
src/media_library.cpp
View File

@@ -125,24 +125,29 @@ void MediaLibrary::Refresh()
void MediaLibrary::SwitchTo() void MediaLibrary::SwitchTo()
{ {
if (myScreen == this && !Config.media_library_disable_two_column_mode) if (myScreen == this)
{ {
hasTwoColumns = !hasTwoColumns; if (Config.media_library_disable_two_column_mode)
hasToBeResized = 1; return;
Artists->Clear();
Albums->Clear();
Albums->Reset();
Songs->Clear();
if (hasTwoColumns)
{
if (w == Artists)
NextColumn();
std::string item_type = IntoStr(Config.media_lib_primary_tag);
ToLower(item_type);
Albums->SetTitle("Albums (sorted by " + item_type + ")");
}
else else
Albums->SetTitle("Albums"); {
hasTwoColumns = !hasTwoColumns;
hasToBeResized = 1;
Artists->Clear();
Albums->Clear();
Albums->Reset();
Songs->Clear();
if (hasTwoColumns)
{
if (w == Artists)
NextColumn();
std::string item_type = IntoStr(Config.media_lib_primary_tag);
ToLower(item_type);
Albums->SetTitle("Albums (sorted by " + item_type + ")");
}
else
Albums->SetTitle("Albums");
}
} }
if (!isInitialized) if (!isInitialized)