Fix link icons on macOS.
[dcpomatic.git] / src / wx / video_panel.cc
index 55c0984a35b65e947ca839d4e9ae5ea9814bb6e5..5d67bc99cc989e3c518cc942a52f50d1a69c83a1 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
 #include "content_colour_conversion_dialog.h"
 #include "content_widget.h"
 #include "content_panel.h"
+#include "static_text.h"
+#include "check_box.h"
+#include "custom_scale_dialog.h"
+#include "dcpomatic_button.h"
 #include "lib/filter.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/colour_conversion.h"
@@ -34,7 +38,9 @@
 #include "lib/dcp_content.h"
 #include "lib/video_content.h"
 #include <wx/spinctrl.h>
-#include <boost/foreach.hpp>
+#include <wx/tglbtn.h>
+#include <boost/unordered_set.hpp>
+#include <boost/functional/hash.hpp>
 #include <set>
 #include <iostream>
 
@@ -44,38 +50,21 @@ using std::pair;
 using std::cout;
 using std::list;
 using std::set;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 using boost::bind;
 using boost::optional;
+using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
-static VideoContentScale
-index_to_scale (int n)
-{
-       vector<VideoContentScale> scales = VideoContentScale::all ();
-       DCPOMATIC_ASSERT (n >= 0);
-       DCPOMATIC_ASSERT (n < int (scales.size ()));
-       return scales[n];
-}
-
-static int
-scale_to_index (VideoContentScale scale)
-{
-       vector<VideoContentScale> scales = VideoContentScale::all ();
-       for (size_t i = 0; i < scales.size(); ++i) {
-               if (scales[i] == scale) {
-                       return i;
-               }
-       }
-
-       DCPOMATIC_ASSERT (false);
-}
 
 VideoPanel::VideoPanel (ContentPanel* p)
        : ContentSubPanel (p, _("Video"))
 {
-       _reference = new wxCheckBox (this, wxID_ANY, _("Use this DCP's video as OV and make VF"));
-       _reference_note = new wxStaticText (this, wxID_ANY, wxT(""));
+       _reference = new CheckBox (this, _("Use this DCP's video as OV and make VF"));
+       _reference_note = new StaticText (this, wxT(""));
        _reference_note->Wrap (200);
        wxFont font = _reference_note->GetFont();
        font.SetStyle(wxFONTSTYLE_ITALIC);
@@ -94,44 +83,74 @@ VideoPanel::VideoPanel (ContentPanel* p)
                &caster<VideoFrameType, int>
                );
 
-       _left_crop_label = create_label (this, _("Left crop"), true);
+       _crop_label = create_label (this, _("Crop"), true);
+
+#if defined(__WXGTK3__)
+       int const crop_width = 128;
+       int const link_width = 32;
+       int const link_height = 64;
+#elif defined(__WXGTK20__)
+       int const crop_width = 56;
+       int const link_width = 24;
+       int const link_height = 32;
+#elif defined(DCPOMATIC_OSX)
+       int const crop_width = 56;
+       int const link_width = 23;
+       int const link_height = 28;
+#else
+       int const crop_width = 56;
+       int const link_width = 22;
+       int const link_height = 28;
+#endif
+
+       _left_crop_label = create_label (this, _("Left"), true);
        _left_crop = new ContentSpinCtrl<VideoContent> (
                this,
-               new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
+               new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(crop_width, -1)),
                VideoContentProperty::CROP,
                &Content::video,
                boost::mem_fn (&VideoContent::left_crop),
-               boost::mem_fn (&VideoContent::set_left_crop)
+               boost::mem_fn (&VideoContent::set_left_crop),
+               boost::bind (&VideoPanel::left_crop_changed, this)
                );
 
-       _right_crop_label = create_label (this, _("Right crop"), true);
+       _left_right_link = new wxToggleButton (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(link_width, link_height));
+       _left_right_link->SetBitmap (wxBitmap(bitmap_path("link"), wxBITMAP_TYPE_PNG));
+
+       _right_crop_label = create_label (this, _("Right"), true);
        _right_crop = new ContentSpinCtrl<VideoContent> (
                this,
-               new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
+               new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(crop_width, -1)),
                VideoContentProperty::CROP,
                &Content::video,
                boost::mem_fn (&VideoContent::right_crop),
-               boost::mem_fn (&VideoContent::set_right_crop)
+               boost::mem_fn (&VideoContent::set_right_crop),
+               boost::bind (&VideoPanel::right_crop_changed, this)
                );
 
-       _top_crop_label = create_label (this, _("Top crop"), true);
+       _top_crop_label = create_label (this, _("Top"), true);
        _top_crop = new ContentSpinCtrl<VideoContent> (
                this,
-               new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
+               new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(crop_width, -1)),
                VideoContentProperty::CROP,
                &Content::video,
                boost::mem_fn (&VideoContent::top_crop),
-               boost::mem_fn (&VideoContent::set_top_crop)
+               boost::mem_fn (&VideoContent::set_top_crop),
+               boost::bind (&VideoPanel::top_crop_changed, this)
                );
 
-       _bottom_crop_label = create_label (this, _("Bottom crop"), true);
+       _top_bottom_link = new wxToggleButton (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(link_width, link_height));
+       _top_bottom_link->SetBitmap (wxBitmap(bitmap_path("link"), wxBITMAP_TYPE_PNG));
+
+       _bottom_crop_label = create_label (this, _("Bottom"), true);
        _bottom_crop = new ContentSpinCtrl<VideoContent> (
                this,
-               new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
+               new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(crop_width, -1)),
                VideoContentProperty::CROP,
                &Content::video,
                boost::mem_fn (&VideoContent::bottom_crop),
-               boost::mem_fn (&VideoContent::set_bottom_crop)
+               boost::mem_fn (&VideoContent::set_bottom_crop),
+               boost::bind (&VideoPanel::bottom_crop_changed, this)
                );
 
        _fade_in_label = create_label (this, _("Fade in"), true);
@@ -140,38 +159,35 @@ VideoPanel::VideoPanel (ContentPanel* p)
        _fade_out_label = create_label (this, _("Fade out"), true);
        _fade_out = new Timecode<ContentTime> (this);
 
-       _scale_to_label = create_label (this, _("Scale to"), true);
-       _scale = new ContentChoice<VideoContent, VideoContentScale> (
-               this,
-               new wxChoice (this, wxID_ANY),
-               VideoContentProperty::SCALE,
-               &Content::video,
-               boost::mem_fn (&VideoContent::scale),
-               boost::mem_fn (&VideoContent::set_scale),
-               &index_to_scale,
-               &scale_to_index
-               );
-
        wxClientDC dc (this);
        wxSize size = dc.GetTextExtent (wxT ("A quite long name"));
+#ifdef __WXGTK3__
+       size.SetWidth (size.GetWidth() + 64);
+#endif
        size.SetHeight (-1);
 
-       _filters_label = create_label (this, _("Filters"), true);
-       _filters = new wxStaticText (this, wxID_ANY, _("None"), wxDefaultPosition, size);
-       _filters_button = new wxButton (this, wxID_ANY, _("Edit..."));
+       _scale_label = create_label (this, _("Scale"), true);
+       _scale_fit = new wxRadioButton (this, wxID_ANY, _("to fit DCP"));
+       _scale_custom = new wxRadioButton (this, wxID_ANY, _("custom"));
+       _scale_custom_edit = new Button (this, _("Edit..."), wxDefaultPosition, small_button_size(this, _("Edit...")));
 
        _colour_conversion_label = create_label (this, _("Colour conversion"), true);
        _colour_conversion = new wxChoice (this, wxID_ANY, wxDefaultPosition, size);
        _colour_conversion->Append (_("None"));
-       BOOST_FOREACH (PresetColourConversion const & i, PresetColourConversion::all()) {
+       for (auto const& i: PresetColourConversion::all()) {
                _colour_conversion->Append (std_to_wx (i.name));
        }
 
        /// TRANSLATORS: translate the word "Custom" here; do not include the "Colour|" prefix
        _colour_conversion->Append (S_("Colour|Custom"));
-       _edit_colour_conversion_button = new wxButton (this, wxID_ANY, _("Edit..."));
+       _edit_colour_conversion_button = new Button (this, _("Edit..."), wxDefaultPosition, small_button_size(this, _("Edit...")));
+
+       _range_label = create_label (this, _("Range"), true);
+       _range = new wxChoice (this, wxID_ANY);
+       _range->Append (_("Full (JPEG, 0-255)"));
+       _range->Append (_("Video (MPEG, 16-235)"));
 
-       _description = new wxStaticText (this, wxID_ANY, wxT ("\n \n \n \n \n"), wxDefaultPosition, wxDefaultSize);
+       _description = new StaticText (this, wxT ("\n \n \n \n \n"), wxDefaultPosition, wxDefaultSize);
        _description->SetFont(font);
 
        _left_crop->wrapped()->SetRange (0, 4096);
@@ -179,11 +195,6 @@ VideoPanel::VideoPanel (ContentPanel* p)
        _right_crop->wrapped()->SetRange (0, 4096);
        _bottom_crop->wrapped()->SetRange (0, 4096);
 
-       _scale->wrapped()->Clear ();
-       BOOST_FOREACH (VideoContentScale const & i, VideoContentScale::all ()) {
-               _scale->wrapped()->Append (std_to_wx (i.name ()));
-       }
-
        _frame_type->wrapped()->Append (_("2D"));
        _frame_type->wrapped()->Append (_("3D"));
        _frame_type->wrapped()->Append (_("3D left/right"));
@@ -198,9 +209,14 @@ VideoPanel::VideoPanel (ContentPanel* p)
        _fade_out->Changed.connect (boost::bind (&VideoPanel::fade_out_changed, 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));
+       _scale_custom->Bind                  (wxEVT_RADIOBUTTON, boost::bind (&VideoPanel::scale_custom_clicked, this));
+       _scale_custom_edit->Bind             (wxEVT_BUTTON,   boost::bind (&VideoPanel::scale_custom_edit_clicked, this));
        _colour_conversion->Bind             (wxEVT_CHOICE,   boost::bind (&VideoPanel::colour_conversion_changed, this));
+       _range->Bind                         (wxEVT_CHOICE,   boost::bind (&VideoPanel::range_changed, this));
        _edit_colour_conversion_button->Bind (wxEVT_BUTTON,   boost::bind (&VideoPanel::edit_colour_conversion_clicked, this));
+       _left_right_link->Bind               (wxEVT_TOGGLEBUTTON, boost::bind(&VideoPanel::left_right_link_clicked, this));
+       _top_bottom_link->Bind               (wxEVT_TOGGLEBUTTON, boost::bind(&VideoPanel::top_bottom_link_clicked, this));
 
        add_to_grid ();
 }
@@ -208,20 +224,13 @@ VideoPanel::VideoPanel (ContentPanel* p)
 void
 VideoPanel::add_to_grid ()
 {
-       bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL;
-
        int r = 0;
 
-       _reference->Show (full);
-       _reference_note->Show (full);
-
-       if (full) {
-               wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL);
-               reference_sizer->Add (_reference, 0);
-               reference_sizer->Add (_reference_note, 0);
-               _grid->Add (reference_sizer, wxGBPosition(r, 0), wxGBSpan(1, 3));
-               ++r;
-       }
+       wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL);
+       reference_sizer->Add (_reference, 0);
+       reference_sizer->Add (_reference_note, 0);
+       _grid->Add (reference_sizer, wxGBPosition(r, 0), wxGBSpan(1, 3));
+       ++r;
 
        add_label_to_sizer (_grid, _type_label, true, wxGBPosition(r, 0));
        _frame_type->add (_grid, wxGBPosition(r, 1), wxGBSpan(1, 2));
@@ -229,80 +238,106 @@ VideoPanel::add_to_grid ()
 
        int cr = 0;
        wxGridBagSizer* crop = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+
        add_label_to_sizer (crop, _left_crop_label, true, wxGBPosition (cr, 0));
-       _left_crop->add (crop, wxGBPosition (cr, 1));
-       add_label_to_sizer (crop, _right_crop_label, true, wxGBPosition (cr, 2));
-       _right_crop->add (crop, wxGBPosition (cr, 3));
+       _left_crop->add (crop, wxGBPosition(cr, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+#ifdef __WXGTK3__
+       crop->Add (_left_right_link, wxGBPosition(cr, 2), wxGBSpan(2, 1));
+       ++cr;
+       add_label_to_sizer (crop, _right_crop_label, true, wxGBPosition(cr, 0));
+       _right_crop->add (crop, wxGBPosition(cr, 1));
+#else
+       crop->Add (_left_right_link, wxGBPosition(cr, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+       add_label_to_sizer (crop, _right_crop_label, true, wxGBPosition (cr, 3));
+       _right_crop->add (crop, wxGBPosition (cr, 4), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+#endif
        ++cr;
        add_label_to_sizer (crop, _top_crop_label, true, wxGBPosition (cr, 0));
-       _top_crop->add (crop, wxGBPosition (cr, 1));
-       add_label_to_sizer (crop, _bottom_crop_label, true, wxGBPosition (cr, 2));
-       _bottom_crop->add (crop, wxGBPosition (cr, 3));
-       _grid->Add (crop, wxGBPosition (r, 0), wxGBSpan (2, 4));
-       r += 2;
-
-       _fade_in_label->Show (full);
-       _fade_in->Show (full);
-       _fade_out_label->Show (full);
-       _fade_out->Show (full);
-       _scale_to_label->Show (full);
-       _scale->show (full);
-       _filters_label->Show (full);
-       _filters->Show (full);
-       _filters_button->Show (full);
-       _colour_conversion_label->Show (full);
-       _colour_conversion->Show (full);
-       _edit_colour_conversion_button->Show (full);
-
-       if (full) {
-               add_label_to_sizer (_grid, _fade_in_label, true, wxGBPosition (r, 0));
-               _grid->Add (_fade_in, wxGBPosition (r, 1), wxGBSpan (1, 3));
-               ++r;
-
-               add_label_to_sizer (_grid, _fade_out_label, true, wxGBPosition (r, 0));
-               _grid->Add (_fade_out, wxGBPosition (r, 1), wxGBSpan (1, 3));
-               ++r;
-
-               add_label_to_sizer (_grid, _scale_to_label, true, wxGBPosition (r, 0));
-               _scale->add (_grid, wxGBPosition (r, 1), wxGBSpan (1, 2));
-               ++r;
-
-               add_label_to_sizer (_grid, _filters_label, true, wxGBPosition (r, 0));
-               {
-                       wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-                       s->Add (_filters, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
-                       s->Add (_filters_button, 0, wxALIGN_CENTER_VERTICAL);
-                       _grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
-               }
-               ++r;
-
-               add_label_to_sizer (_grid, _colour_conversion_label, true, wxGBPosition(r, 0));
-               {
-                       wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-                       s->Add (_colour_conversion, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
-                       s->Add (_edit_colour_conversion_button, 0, wxALIGN_CENTER_VERTICAL);
-                       _grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
-               }
-               ++r;
+       _top_crop->add (crop, wxGBPosition (cr, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+#ifdef __WXGTK3__
+       crop->Add (_top_bottom_link, wxGBPosition(cr, 2), wxGBSpan(2, 1));
+       ++cr;
+       add_label_to_sizer (crop, _bottom_crop_label, true, wxGBPosition(cr, 0));
+       _bottom_crop->add (crop, wxGBPosition(cr, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+#else
+       crop->Add (_top_bottom_link, wxGBPosition(cr, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+       add_label_to_sizer (crop, _bottom_crop_label, true, wxGBPosition (cr, 3));
+       _bottom_crop->add (crop, wxGBPosition (cr, 4), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+#endif
+       add_label_to_sizer (_grid, _crop_label, true, wxGBPosition(r, 0));
+       _grid->Add (crop, wxGBPosition(r, 1));
+       ++r;
+
+       add_label_to_sizer (_grid, _fade_in_label, true, wxGBPosition (r, 0));
+       _grid->Add (_fade_in, wxGBPosition (r, 1), wxGBSpan (1, 3));
+       ++r;
+
+       add_label_to_sizer (_grid, _fade_out_label, true, wxGBPosition (r, 0));
+       _grid->Add (_fade_out, wxGBPosition (r, 1), wxGBSpan (1, 3));
+       ++r;
+
+       add_label_to_sizer (_grid, _scale_label, true, wxGBPosition (r, 0));
+       {
+               wxSizer* v = new wxBoxSizer (wxVERTICAL);
+               v->Add (_scale_fit, 0, wxBOTTOM, 4);
+               wxSizer* h = new wxBoxSizer (wxHORIZONTAL);
+               h->Add (_scale_custom, 1, wxRIGHT | wxALIGN_CENTER_VERTICAL, 6);
+               h->Add (_scale_custom_edit, 0, wxALIGN_CENTER_VERTICAL);
+               v->Add (h, 0);
+               _grid->Add (v, wxGBPosition(r, 1));
        }
+       ++r;
+
+       add_label_to_sizer (_grid, _colour_conversion_label, true, wxGBPosition(r, 0));
+       {
+               wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+               s->Add (_colour_conversion, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
+               s->Add (_edit_colour_conversion_button, 0, wxALIGN_CENTER_VERTICAL);
+               _grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+       }
+       ++r;
+
+       add_label_to_sizer (_grid, _range_label, true, wxGBPosition(r, 0));
+       _grid->Add (_range, wxGBPosition(r, 1), wxGBSpan(1, 2), wxALIGN_CENTER_VERTICAL);
+       ++r;
 
        _grid->Add (_description, wxGBPosition (r, 0), wxGBSpan (1, 4), wxEXPAND | wxALIGN_CENTER_VERTICAL, 6);
        ++r;
 }
 
+void
+VideoPanel::range_changed ()
+{
+       ContentList vc = _parent->selected_video ();
+       if (vc.size() != 1) {
+               return;
+       }
+
+       switch (_range->GetSelection()) {
+       case 0:
+               vc.front()->video->set_range (VideoRange::FULL);
+               break;
+       case 1:
+               vc.front()->video->set_range (VideoRange::VIDEO);
+               break;
+       default:
+               DCPOMATIC_ASSERT (false);
+       }
+}
+
 
 void
 VideoPanel::film_changed (Film::Property property)
 {
        switch (property) {
-       case Film::VIDEO_FRAME_RATE:
-       case Film::CONTAINER:
-       case Film::RESOLUTION:
+       case Film::Property::VIDEO_FRAME_RATE:
+       case Film::Property::CONTAINER:
+       case Film::Property::RESOLUTION:
                setup_description ();
                setup_sensitivity ();
                break;
-       case Film::REEL_TYPE:
-       case Film::INTEROP:
+       case Film::Property::REEL_TYPE:
+       case Film::Property::INTEROP:
                setup_sensitivity ();
                break;
        default:
@@ -310,6 +345,17 @@ VideoPanel::film_changed (Film::Property property)
        }
 }
 
+std::size_t
+hash_value (boost::optional<ColourConversion> const & c)
+{
+       boost::hash<string> hasher;
+       if (!c) {
+               return hasher ("none");
+       }
+       return hasher (c->identifier());
+}
+
+
 void
 VideoPanel::film_content_changed (int property)
 {
@@ -327,35 +373,45 @@ VideoPanel::film_content_changed (int property)
            property == VideoContentProperty::SCALE) {
                setup_description ();
        } else if (property == VideoContentProperty::COLOUR_CONVERSION) {
-               if (vcs && vcs->video->colour_conversion ()) {
-                       optional<size_t> preset = vcs->video->colour_conversion().get().preset ();
-                       vector<PresetColourConversion> cc = PresetColourConversion::all ();
-                       if (preset) {
-                               checked_set (_colour_conversion, preset.get() + 1);
-                       } else {
-                               checked_set (_colour_conversion, cc.size() + 1);
-                       }
-               } else {
-                       checked_set (_colour_conversion, 0);
+               boost::unordered_set<optional<ColourConversion> > check;
+               for (auto i: vc) {
+                       check.insert (i->video->colour_conversion());
                }
 
-               setup_sensitivity ();
+               /* Remove any "Many" entry that we might have added previously.  There should
+                * be entries for each preset plus one for "None" and one for "Custom".
+                */
+               vector<PresetColourConversion> cc = PresetColourConversion::all ();
+               if (_colour_conversion->GetCount() > cc.size() + 2) {
+                       _colour_conversion->Delete (_colour_conversion->GetCount() - 1);
+               }
 
-       } else if (property == FFmpegContentProperty::FILTERS) {
-               if (fcs) {
-                       string p = Filter::ffmpeg_string (fcs->filters ());
-                       if (p.empty ()) {
-                               checked_set (_filters, _("None"));
-                       } else {
-                               if (p.length() > 25) {
-                                       p = p.substr (0, 25) + "...";
+               if (check.size() == 1) {
+                       if (vcs && vcs->video->colour_conversion ()) {
+                               optional<size_t> preset = vcs->video->colour_conversion().get().preset ();
+                               if (preset) {
+                                       checked_set (_colour_conversion, preset.get() + 1);
+                               } else {
+                                       checked_set (_colour_conversion, cc.size() + 1);
                                }
-                               checked_set (_filters, p);
+                       } else {
+                               checked_set (_colour_conversion, 0);
                        }
+               } else if (check.size() > 1) {
+                       /* Add a "many" entry and select it as an indication that multiple different
+                        * colour conversions are present in the selection.
+                        */
+                       _colour_conversion->Append (_("Many"));
+                       checked_set (_colour_conversion, _colour_conversion->GetCount() - 1);
                }
+
+               setup_sensitivity ();
+
+       } else if (property == VideoContentProperty::USE) {
+               setup_sensitivity ();
        } else if (property == VideoContentProperty::FADE_IN) {
                set<Frame> check;
-               BOOST_FOREACH (shared_ptr<const Content> i, vc) {
+               for (auto i: vc) {
                        check.insert (i->video->fade_in ());
                }
 
@@ -369,7 +425,7 @@ VideoPanel::film_content_changed (int property)
                }
        } else if (property == VideoContentProperty::FADE_OUT) {
                set<Frame> check;
-               BOOST_FOREACH (shared_ptr<const Content> i, vc) {
+               for (auto i: vc) {
                        check.insert (i->video->fade_out ());
                }
 
@@ -390,24 +446,32 @@ VideoPanel::film_content_changed (int property)
                }
 
                setup_sensitivity ();
-       }
-}
+       } else if (property == VideoContentProperty::RANGE) {
+               if (vcs) {
+                       checked_set (_range, vcs->video->range() == VideoRange::FULL ? 0 : 1);
+               } else {
+                       checked_set (_range, 0);
+               }
 
-/** Called when the `Edit filters' button has been clicked */
-void
-VideoPanel::edit_filters_clicked ()
-{
-       FFmpegContentList c = _parent->selected_ffmpeg ();
-       if (c.size() != 1) {
-               return;
-       }
+               setup_sensitivity ();
+       } else if (property == VideoContentProperty::CUSTOM_RATIO || property == VideoContentProperty::CUSTOM_SIZE) {
+               set<Frame> check;
+               for (auto i: vc) {
+                       check.insert (i->video->custom_ratio() || i->video->custom_size());
+               }
 
-       FilterDialog* d = new FilterDialog (this, c.front()->filters());
-       d->ActiveChanged.connect (bind (&FFmpegContent::set_filters, c.front(), _1));
-       d->ShowModal ();
-       d->Destroy ();
+               if (check.size() == 1) {
+                       checked_set (_scale_fit, !vc.front()->video->custom_ratio() && !vc.front()->video->custom_size());
+                       checked_set (_scale_custom, vc.front()->video->custom_ratio() || vc.front()->video->custom_size());
+               } else {
+                       checked_set (_scale_fit, true);
+                       checked_set (_scale_custom, false);
+               }
+               setup_sensitivity ();
+       }
 }
 
+
 void
 VideoPanel::setup_description ()
 {
@@ -435,19 +499,20 @@ void
 VideoPanel::colour_conversion_changed ()
 {
        ContentList vc = _parent->selected_video ();
-       if (vc.size() != 1) {
-               return;
-       }
 
        int const s = _colour_conversion->GetSelection ();
        vector<PresetColourConversion> all = PresetColourConversion::all ();
 
-       if (s == 0) {
-               vc.front()->video->unset_colour_conversion ();
-       } else if (s == int (all.size() + 1)) {
+       if (s == int(all.size() + 1)) {
                edit_colour_conversion_clicked ();
        } else {
-               vc.front()->video->set_colour_conversion (all[s - 1].conversion);
+               for (auto i: _parent->selected_video()) {
+                       if (s == 0) {
+                               i->video->unset_colour_conversion ();
+                       } else if (s != int(all.size() + 2)) {
+                               i->video->set_colour_conversion (all[s - 1].conversion);
+                       }
+               }
        }
 }
 
@@ -455,14 +520,13 @@ void
 VideoPanel::edit_colour_conversion_clicked ()
 {
        ContentList vc = _parent->selected_video ();
-       if (vc.size() != 1) {
-               return;
-       }
 
        ContentColourConversionDialog* d = new ContentColourConversionDialog (this, vc.front()->video->yuv ());
        d->set (vc.front()->video->colour_conversion().get_value_or (PresetColourConversion::all().front().conversion));
        if (d->ShowModal() == wxID_OK) {
-               vc.front()->video->set_colour_conversion (d->get ());
+               for (auto i: vc) {
+                       i->video->set_colour_conversion (d->get ());
+               }
        } else {
                /* Reset the colour conversion choice */
                film_content_changed (VideoContentProperty::COLOUR_CONVERSION);
@@ -480,13 +544,16 @@ VideoPanel::content_selection_changed ()
        _right_crop->set_content (video_sel);
        _top_crop->set_content (video_sel);
        _bottom_crop->set_content (video_sel);
-       _scale->set_content (video_sel);
 
        film_content_changed (ContentProperty::VIDEO_FRAME_RATE);
        film_content_changed (VideoContentProperty::CROP);
        film_content_changed (VideoContentProperty::COLOUR_CONVERSION);
        film_content_changed (VideoContentProperty::FADE_IN);
        film_content_changed (VideoContentProperty::FADE_OUT);
+       film_content_changed (VideoContentProperty::RANGE);
+       film_content_changed (VideoContentProperty::USE);
+       film_content_changed (VideoContentProperty::CUSTOM_RATIO);
+       film_content_changed (VideoContentProperty::CUSTOM_SIZE);
        film_content_changed (FFmpegContentProperty::FILTERS);
        film_content_changed (DCPContentProperty::REFERENCE_VIDEO);
 
@@ -505,9 +572,24 @@ VideoPanel::setup_sensitivity ()
 
        string why_not;
        bool const can_reference = dcp && dcp->can_reference_video (_parent->film(), why_not);
-       setup_refer_button (_reference, _reference_note, dcp, can_reference, why_not);
+       wxString cannot;
+       if (why_not.empty()) {
+               cannot = _("Cannot reference this DCP's video.");
+       } else {
+               cannot = _("Cannot reference this DCP's video: ") + std_to_wx(why_not);
+       }
+       setup_refer_button (_reference, _reference_note, dcp, can_reference, cannot);
+
+       bool any_use = false;
+       for (auto i: _parent->selected_video()) {
+               if (i->video && i->video->use()) {
+                       any_use = true;
+               }
+       }
+
+       bool const enable = !_reference->GetValue() && any_use;
 
-       if (_reference->GetValue ()) {
+       if (!enable) {
                _frame_type->wrapped()->Enable (false);
                _left_crop->wrapped()->Enable (false);
                _right_crop->wrapped()->Enable (false);
@@ -515,11 +597,12 @@ VideoPanel::setup_sensitivity ()
                _bottom_crop->wrapped()->Enable (false);
                _fade_in->Enable (false);
                _fade_out->Enable (false);
-               _scale->wrapped()->Enable (false);
+               _scale_fit->Enable (false);
+               _scale_custom->Enable (false);
+               _scale_custom_edit->Enable (false);
                _description->Enable (false);
-               _filters->Enable (false);
-               _filters_button->Enable (false);
                _colour_conversion->Enable (false);
+               _range->Enable (false);
        } else {
                ContentList video_sel = _parent->selected_video ();
                FFmpegContentList ffmpeg_sel = _parent->selected_ffmpeg ();
@@ -532,11 +615,12 @@ VideoPanel::setup_sensitivity ()
                _bottom_crop->wrapped()->Enable (true);
                _fade_in->Enable (!video_sel.empty ());
                _fade_out->Enable (!video_sel.empty ());
-               _scale->wrapped()->Enable (true);
+               _scale_fit->Enable (true);
+               _scale_custom->Enable (true);
+               _scale_custom_edit->Enable (_scale_custom->GetValue());
                _description->Enable (true);
-               _filters->Enable (true);
-               _filters_button->Enable (single && !ffmpeg_sel.empty ());
-               _colour_conversion->Enable (single && !video_sel.empty ());
+               _colour_conversion->Enable (!video_sel.empty());
+               _range->Enable (single && !video_sel.empty() && !dcp);
        }
 
        ContentList vc = _parent->selected_video ();
@@ -555,21 +639,24 @@ VideoPanel::setup_sensitivity ()
 void
 VideoPanel::fade_in_changed ()
 {
-       BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_video ()) {
-               int const vfr = _parent->film()->video_frame_rate ();
-               i->video->set_fade_in (_fade_in->get (vfr).frames_round (vfr));
+       auto const hmsf = _fade_in->get();
+       for (auto i: _parent->selected_video()) {
+               double const vfr = i->active_video_frame_rate (_parent->film());
+               i->video->set_fade_in (dcpomatic::ContentTime(hmsf, vfr).frames_round(vfr));
        }
 }
 
 void
 VideoPanel::fade_out_changed ()
 {
-       BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_video ()) {
-               int const vfr = _parent->film()->video_frame_rate ();
-               i->video->set_fade_out (_fade_out->get (vfr).frames_round (vfr));
+       auto const hmsf = _fade_out->get();
+       for (auto i: _parent->selected_video()) {
+               double const vfr = i->active_video_frame_rate (_parent->film());
+               i->video->set_fade_out (dcpomatic::ContentTime(hmsf, vfr).frames_round(vfr));
        }
 }
 
+
 void
 VideoPanel::reference_clicked ()
 {
@@ -585,3 +672,111 @@ VideoPanel::reference_clicked ()
 
        d->set_reference_video (_reference->GetValue ());
 }
+
+
+void
+VideoPanel::scale_fit_clicked ()
+{
+       for (auto i: _parent->selected_video()) {
+               i->video->set_custom_ratio (optional<float>());
+       }
+}
+
+
+void
+VideoPanel::scale_custom_clicked ()
+{
+       if (!scale_custom_edit_clicked()) {
+               _scale_fit->SetValue (true);
+       }
+}
+
+
+bool
+VideoPanel::scale_custom_edit_clicked ()
+{
+       shared_ptr<const VideoContent> vc = _parent->selected_video().front()->video;
+       CustomScaleDialog* d = new CustomScaleDialog (this, vc->size(), _parent->film()->frame_size(), vc->custom_ratio(), vc->custom_size());
+       int const r = d->ShowModal ();
+       if (r == wxID_OK) {
+               for (auto i: _parent->selected_video()) {
+                       i->video->set_custom_ratio (d->custom_ratio());
+                       i->video->set_custom_size (d->custom_size());
+               }
+       }
+       d->Destroy ();
+       return r == wxID_OK;
+}
+
+
+void
+VideoPanel::left_right_link_clicked ()
+{
+       if (_left_changed_last) {
+               left_crop_changed ();
+       } else {
+               right_crop_changed ();
+       }
+}
+
+
+void
+VideoPanel::top_bottom_link_clicked ()
+{
+       if (_top_changed_last) {
+               top_crop_changed ();
+       } else {
+               bottom_crop_changed ();
+       }
+}
+
+
+void
+VideoPanel::left_crop_changed ()
+{
+       _left_changed_last = true;
+       if (_left_right_link->GetValue()) {
+               for (auto i: _parent->selected_video()) {
+                       i->video->set_right_crop (i->video->left_crop());
+               }
+       }
+}
+
+
+void
+VideoPanel::right_crop_changed ()
+{
+       _left_changed_last = false;
+       if (_left_right_link->GetValue()) {
+               for (auto i: _parent->selected_video()) {
+                       i->video->set_left_crop (i->video->right_crop());
+               }
+       }
+}
+
+
+void
+VideoPanel::top_crop_changed ()
+{
+       _top_changed_last = true;
+       if (_top_bottom_link->GetValue()) {
+               for (auto i: _parent->selected_video()) {
+                       i->video->set_bottom_crop (i->video->top_crop());
+               }
+       }
+}
+
+
+void
+VideoPanel::bottom_crop_changed ()
+{
+       _top_changed_last = false;
+       if (_top_bottom_link->GetValue()) {
+               for (auto i: _parent->selected_video()) {
+                       i->video->set_top_crop (i->video->bottom_crop());
+               }
+       }
+}
+
+
+