bindings: bind sorting actions to ctrl-s

NEWS

@@ -25,6 +25,7 @@ ncmpcpp-0.7 (????-??-??)
 * Action that updates the environment can now be used in bindings configuration file.
 * Searching in text fields now respects regular expression configuration.
 * Monolithic 'press_space' action was split into 'add_item_to_playlist', 'toggle_lyrics_update_on_song_change' and 'toggle_visualization_type'.
+* Sorting actions were rebound to Ctrl-S.
 
 ncmpcpp-0.6.4 (2015-05-02)
 

doc/bindings

@@ -352,9 +352,15 @@
 #def_key "u"
 #  update_database
 #
-#def_key "ctrl_v"
+#def_key "ctrl_s"
 #  sort_playlist
 #
+#def_key "ctrl_s"
+#  toggle_browser_sort_mode
+#
+#def_key "ctrl_s"
+#  toggle_media_library_sort_mode
+#
 #def_key "ctrl_r"
 #  reverse_playlist
 #
@@ -440,9 +446,6 @@
 #  move_selected_items_up
 #
 #def_key "m"
-#  toggle_media_library_sort_mode
-#
-#def_key "m"
 #  set_visualizer_sample_multiplier
 #
 #def_key "n"
@@ -497,9 +500,6 @@
 #  toggle_screen_lock
 #
 #def_key "`"
-#  toggle_browser_sort_mode
-#
-#def_key "`"
 #  toggle_library_tag_type
 #
 #def_key "`"

src/bindings.cpp

@@ -589,8 +589,12 @@ void BindingsConfiguration::generateDefaults()
 		bind(k, Actions::Type::SetCrossfade);
 	if (notBound(k = stringToKey("u")))
 		bind(k, Actions::Type::UpdateDatabase);
-	if (notBound(k = stringToKey("ctrl_v")))
+	if (notBound(k = stringToKey("ctrl_s")))
+	{
 		bind(k, Actions::Type::SortPlaylist);
+		bind(k, Actions::Type::ToggleBrowserSortMode);
+		bind(k, Actions::Type::ToggleMediaLibrarySortMode);
+	}
 	if (notBound(k = stringToKey("ctrl_r")))
 		bind(k, Actions::Type::ReversePlaylist);
 	if (notBound(k = stringToKey("/")))
@@ -648,7 +652,6 @@ void BindingsConfiguration::generateDefaults()
 	{
 		bind(k, Actions::Type::MoveSortOrderUp);
 		bind(k, Actions::Type::MoveSelectedItemsUp);
-		bind(k, Actions::Type::ToggleMediaLibrarySortMode);
 		bind(k, Actions::Type::SetVisualizerSampleMultiplier);
 	}
 	if (notBound(k = stringToKey("n")))
@@ -689,7 +692,6 @@ void BindingsConfiguration::generateDefaults()
 		bind(k, Actions::Type::ToggleScreenLock);
 	if (notBound(k = stringToKey("`")))
 	{
-		bind(k, Actions::Type::ToggleBrowserSortMode);
 		bind(k, Actions::Type::ToggleLibraryTagType);
 		bind(k, Actions::Type::RefetchLyrics);
 		bind(k, Actions::Type::AddRandomItems);