Add a new "Advanced settings" dialog for content, accessible

from the right-click menu.  Move the "use video" checkbox into
here, as it feels like excessive clutter to have it in the main
video panel.

Maybe other things should be hidden in here.  I'm looking at you,
video filters...

1 files changed, 7 insertions, 27 deletions

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 24099e1cc..4be9a741f 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -69,8 +69,6 @@ VideoPanel::VideoPanel (ContentPanel* p)
 	font.SetPointSize(font.GetPointSize() - 1);
 	_reference_note->SetFont(font);
 
-	_use = new wxCheckBox (this, wxID_ANY, _("Use"));
-
 	_type_label = create_label (this, _("Type"), true);
 	_frame_type = new ContentChoice<VideoContent, VideoFrameType> (
 		this,
@@ -194,7 +192,6 @@ VideoPanel::VideoPanel (ContentPanel* p)
 	_fade_in->Changed.connect (boost::bind (&VideoPanel::fade_in_changed, this));
 	_fade_out->Changed.connect (boost::bind (&VideoPanel::fade_out_changed, this));
 
-	_use->Bind                           (wxEVT_CHECKBOX, boost::bind (&VideoPanel::use_clicked, this));
 	_reference->Bind                     (wxEVT_CHECKBOX, boost::bind (&VideoPanel::reference_clicked, this));
 	_filters_button->Bind                (wxEVT_BUTTON,   boost::bind (&VideoPanel::edit_filters_clicked, this));
 	_scale_fit->Bind                     (wxEVT_RADIOBUTTON, boost::bind (&VideoPanel::scale_fit_clicked, this));
@@ -227,10 +224,6 @@ VideoPanel::add_to_grid ()
 		++r;
 	}
 
-	_use->Show (full);
-	_grid->Add (_use, wxGBPosition(r, 0), wxGBSpan(1, 2));
-	++r;
-
 	add_label_to_sizer (_grid, _type_label, true, wxGBPosition(r, 0));
 	_frame_type->add (_grid, wxGBPosition(r, 1), wxGBSpan(1, 2));
 	++r;
@@ -428,17 +421,6 @@ VideoPanel::film_content_changed (int property)
 			}
 		}
 	} else if (property == VideoContentProperty::USE) {
-		set<bool> check;
-		BOOST_FOREACH (shared_ptr<const Content> i, vc) {
-			check.insert (i->video->use());
-		}
-
-		if (check.size() == 1) {
-			checked_set (_use, vc.front()->video->use());
-		} else {
-			checked_set (_use, false);
-		}
-
 		setup_sensitivity ();
 	} else if (property == VideoContentProperty::FADE_IN) {
 		set<Frame> check;
@@ -625,9 +607,14 @@ VideoPanel::setup_sensitivity ()
 	}
 	setup_refer_button (_reference, _reference_note, dcp, can_reference, cannot);
 
-	bool const enable = !_reference->GetValue() && _use->GetValue();
+	bool any_use = false;
+	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_video()) {
+		if (i->video && i->video->use()) {
+			any_use = true;
+		}
+	}
 
-	_use->Enable (!_reference->GetValue());
+	bool const enable = !_reference->GetValue() && any_use;
 
 	if (!enable) {
 		_frame_type->wrapped()->Enable (false);
@@ -698,13 +685,6 @@ VideoPanel::fade_out_changed ()
 	}
 }
 
-void
-VideoPanel::use_clicked ()
-{
-	BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_video()) {
-		i->video->set_use (_use->GetValue());
-	}
-}
 
 void
 VideoPanel::reference_clicked ()