why_not in can_reference can just be a string rather than a list of strings.

[dcpomatic.git] / src / wx / video_panel.cc

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 462f2bdae3925ceb69aae168a1a8afba0f92937e..5fbe518c46196318564087c45c7032069f7b75a1 100644 (file)
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -79,7 +79,7 @@ VideoPanel::VideoPanel (ContentPanel* p)
 
        int r = 0;
 
-       _reference = new wxCheckBox (this, wxID_ANY, _("Refer to existing DCP"));
+       _reference = new wxCheckBox (this, wxID_ANY, _("Use this DCP's video as OV and make VF"));
        grid->Add (_reference, wxGBPosition (r, 0), wxGBSpan (1, 2));
        ++r;
 
@@ -184,7 +184,7 @@ VideoPanel::VideoPanel (ContentPanel* p)
                wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 
                _filters = new wxStaticText (this, wxID_ANY, _("None"), wxDefaultPosition, size);
-               s->Add (_filters, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
+               s->Add (_filters, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
                _filters_button = new wxButton (this, wxID_ANY, _("Edit..."));
                s->Add (_filters_button, 0, wxALIGN_CENTER_VERTICAL);
 
@@ -204,7 +204,7 @@ VideoPanel::VideoPanel (ContentPanel* p)
 
                /// TRANSLATORS: translate the word "Custom" here; do not include the "Colour|" prefix
                _colour_conversion->Append (S_("Colour|Custom"));
-               s->Add (_colour_conversion, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
+               s->Add (_colour_conversion, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
 
                _edit_colour_conversion_button = new wxButton (this, wxID_ANY, _("Edit..."));
                s->Add (_edit_colour_conversion_button, 0, wxALIGN_CENTER_VERTICAL);
@@ -462,7 +462,7 @@ VideoPanel::setup_sensitivity ()
                dcp = dynamic_pointer_cast<DCPContent> (sel.front ());
        }
 
-       list<string> why_not;
+       string why_not;
        bool const can_reference = dcp && dcp->can_reference_video (why_not);
        setup_refer_button (_reference, dcp, can_reference, why_not);