Allow removal of multiple pieces of content in one click.

diff --git a/ChangeLog b/ChangeLog
index 3887105ace73072d82b0b70a97cb0f41e9c42a11..558990cbc6fcee9858cd0982b0917d7352d7ee0f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2016-02-01  Carl Hetherington  <cth@carlh.net>
 
+       * Allow removal of multiple pieces of content in one click.
+
        * Synchronise content list / timeline selection when
        the content list selection changes.
 

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 6b2d30b9ca6153fe5256a6dcc8c03b410c4d69ea..deeef7f80be5359bb43d640f7b7b7beea62afb30 100644 (file)
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -328,9 +328,8 @@ ContentPanel::add_folder_clicked ()
 void
 ContentPanel::remove_clicked ()
 {
-       ContentList c = selected ();
-       if (c.size() == 1) {
-               _film->remove_content (c.front ());
+       BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
+               _film->remove_content (i);
        }
 
        selection_changed ();
@@ -365,7 +364,7 @@ ContentPanel::setup_sensitivity ()
        VideoContentList video_selection = selected_video ();
        AudioContentList audio_selection = selected_audio ();
 
-       _remove->Enable   (selection.size() == 1 && _generally_sensitive);
+       _remove->Enable   (!selection.empty() && _generally_sensitive);
        _earlier->Enable  (selection.size() == 1 && _generally_sensitive);
        _later->Enable    (selection.size() == 1 && _generally_sensitive);
        _timeline->Enable (!_film->content().empty() && _generally_sensitive);