From 0068909541bfd89079bbf4c18c7246b6327e2585 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 1 Feb 2016 23:34:53 +0000 Subject: Allow removal of multiple pieces of content in one click. --- ChangeLog | 2 ++ src/wx/content_panel.cc | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3887105ac..558990cbc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2016-02-01 Carl Hetherington + * 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 6b2d30b9c..deeef7f80 100644 --- 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 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); -- cgit v1.2.3