From b48133a743bbdb4df609a51bf004d037f53f5ea1 Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Sat, 10 Oct 2009 22:28:10 +0200 Subject: [PATCH] change keybinding for changing browse mode I shouldn't do that, but the old one will be much better for choosing whether songs in browser have to be sorted by names or modification date. Besides, binding this to browser key makes browser behaviour more "compatible" with media library. --- src/browser.cpp | 5 +++++ src/help.cpp | 2 +- src/ncmpcpp.cpp | 6 ------ 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/browser.cpp b/src/browser.cpp index cb193f11..d621a3fe 100644 --- a/src/browser.cpp +++ b/src/browser.cpp @@ -72,7 +72,12 @@ void Browser::Resize() void Browser::SwitchTo() { if (myScreen == this) + { +# ifndef WIN32 + myBrowser->ChangeBrowseMode(); +# endif // !WIN32 return; + } if (!isInitialized) Init(); diff --git a/src/help.cpp b/src/help.cpp index 2f21287e..ed0449c8 100644 --- a/src/help.cpp +++ b/src/help.cpp @@ -229,7 +229,7 @@ void Help::GetKeybindings() *w << DisplayKeys(Key.EditTags) << "Rename playlist/directory\n"; # endif // HAVE_TAGLIB_H if (Mpd.GetHostname()[0] == '/') // are we connected to unix socket? - *w << DisplayKeys(Key.SwitchTagTypeList)<< "Browse MPD database/local filesystem\n"; + *w << DisplayKeys(Key.Browser) << "Browse MPD database/local filesystem\n"; *w << DisplayKeys(Key.GoToNowPlaying) << "Locate currently playing song\n"; *w << DisplayKeys(Key.GoToParentDir) << "Go to parent directory\n"; *w << DisplayKeys(Key.Delete) << "Delete playlist/file/directory\n"; diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp index a273953e..b31408f1 100644 --- a/src/ncmpcpp.cpp +++ b/src/ncmpcpp.cpp @@ -1808,12 +1808,6 @@ int main(int argc, char *argv[]) if (number && Mpd.AddRandomSongs(number)) ShowMessage("%zu random song%s added to playlist!", number, number == 1 ? "" : "s"); } -# ifndef WIN32 - else if (myScreen == myBrowser) - { - myBrowser->ChangeBrowseMode(); - } -# endif // !WIN32 else if (myScreen->ActiveWindow() == myLibrary->Artists || (myLibrary->Columns() == 2 && myScreen->ActiveWindow() == myLibrary->Albums)) {