diff options
| author | Andrzej Rybczak <electricityispower@gmail.com> | 2014-11-07 23:13:13 +0100 |
|---|---|---|
| committer | Andrzej Rybczak <electricityispower@gmail.com> | 2014-11-07 23:13:13 +0100 |
| commit | 543dadf3c6a8c3fb823b2a76b22dfe4414509ae5 (patch) | |
| tree | 9ebfbf17357fe8aaaa00ef2a16bd6ce0d5e33473 | |
| parent | 6a5f46a4589ddbe43ba00feeb95f10f8b467dbe2 (diff) | |
| parent | 2ef83ff15ff52f437ebe11844b5a2d0a36497dde (diff) | |
Merge branch '0.6.x'
Conflicts:
NEWS
configure.ac
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | doc/bindings | 3 | ||||
| -rw-r--r-- | src/bindings.cpp | 1 |
3 files changed, 8 insertions, 0 deletions
@@ -9,6 +9,10 @@ ncmpcpp-0.7 (????-??-??) * List filtering has been removed due to the major part of its functionality overlapping with find forward/backward. * Find backward/forward function is now incremental. +ncmpcpp-0.6.2 (????-??-??) + +* Delete key now aditionally binds by default to action that deletes files in browser. + ncmpcpp-0.6.1 (2014-11-06) * Comment tag is now properly written to mp3 files. diff --git a/doc/bindings b/doc/bindings index 86854efd..14ce304a 100644 --- a/doc/bindings +++ b/doc/bindings @@ -187,6 +187,9 @@ # delete_playlist_items # #def_key "delete" +# delete_browser_items +# +#def_key "delete" # delete_stored_playlist # #def_key "right" diff --git a/src/bindings.cpp b/src/bindings.cpp index 2e07bc01..355484c5 100644 --- a/src/bindings.cpp +++ b/src/bindings.cpp @@ -366,6 +366,7 @@ void BindingsConfiguration::generateDefaults() if (notBound(k = stringToKey("delete"))) { bind(k, Actions::Type::DeletePlaylistItems); + bind(k, Actions::Type::DeleteBrowserItems); bind(k, Actions::Type::DeleteStoredPlaylist); } if (notBound(k = stringToKey("right"))) |