Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 8a8dbd181609e5c15734cc2fc4770bcdb5fd5c20..2c6b4597dceb65b7a058ee15f33f46aaf9605bd2 100644 (file)
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -74,15 +74,26 @@ scale_to_index (VideoContentScale scale)
 VideoPanel::VideoPanel (ContentPanel* p)
        : ContentSubPanel (p, _("Video"))
 {
+       wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL);
+
+       _reference = new wxCheckBox (this, wxID_ANY, _("Use this DCP's video as OV and make VF"));
+       reference_sizer->Add (_reference, 0, wxLEFT | wxRIGHT | wxTOP, DCPOMATIC_SIZER_GAP);
+
+       _reference_note = new wxStaticText (this, wxID_ANY, _(""));
+       _reference_note->Wrap (200);
+       reference_sizer->Add (_reference_note, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP);
+       wxFont font = _reference_note->GetFont();
+       font.SetStyle(wxFONTSTYLE_ITALIC);
+       font.SetPointSize(font.GetPointSize() - 1);
+       _reference_note->SetFont(font);
+
+       _sizer->Add (reference_sizer);
+
        wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
        _sizer->Add (grid, 0, wxALL, 8);
 
        int r = 0;
 
-       _reference = new wxCheckBox (this, wxID_ANY, _("Refer to existing DCP"));
-       grid->Add (_reference, wxGBPosition (r, 0), wxGBSpan (1, 2));
-       ++r;
-
        add_label_to_sizer (grid, this, _("Type"), true, wxGBPosition (r, 0));
        _frame_type = new ContentChoice<VideoContent, VideoFrameType> (
                this,
@@ -184,7 +195,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 +215,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);
@@ -215,9 +226,6 @@ VideoPanel::VideoPanel (ContentPanel* p)
 
        _description = new wxStaticText (this, wxID_ANY, wxT ("\n \n \n \n \n"), wxDefaultPosition, wxDefaultSize);
        grid->Add (_description, wxGBPosition (r, 0), wxGBSpan (1, 4), wxEXPAND | wxALIGN_CENTER_VERTICAL, 6);
-       wxFont font = _description->GetFont();
-       font.SetStyle(wxFONTSTYLE_ITALIC);
-       font.SetPointSize(font.GetPointSize() - 1);
        _description->SetFont(font);
        ++r;
 
@@ -232,6 +240,7 @@ VideoPanel::VideoPanel (ContentPanel* p)
        }
 
        _frame_type->wrapped()->Append (_("2D"));
+       _frame_type->wrapped()->Append (_("3D"));
        _frame_type->wrapped()->Append (_("3D left/right"));
        _frame_type->wrapped()->Append (_("3D top/bottom"));
        _frame_type->wrapped()->Append (_("3D alternate"));
@@ -241,24 +250,28 @@ 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));
 
-       _reference->Bind                     (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&VideoPanel::reference_clicked, this));
-       _filters_button->Bind                (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&VideoPanel::edit_filters_clicked, this));
-       _colour_conversion->Bind             (wxEVT_COMMAND_CHOICE_SELECTED,  boost::bind (&VideoPanel::colour_conversion_changed, this));
-       _edit_colour_conversion_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&VideoPanel::edit_colour_conversion_clicked, this));
+       _reference->Bind                     (wxEVT_CHECKBOX, boost::bind (&VideoPanel::reference_clicked, this));
+       _filters_button->Bind                (wxEVT_BUTTON,   boost::bind (&VideoPanel::edit_filters_clicked, this));
+       _colour_conversion->Bind             (wxEVT_CHOICE,  boost::bind (&VideoPanel::colour_conversion_changed, this));
+       _edit_colour_conversion_button->Bind (wxEVT_BUTTON,   boost::bind (&VideoPanel::edit_colour_conversion_clicked, this));
 }
 
 void
 VideoPanel::film_changed (Film::Property property)
 {
        switch (property) {
-       case Film::CONTAINER:
        case Film::VIDEO_FRAME_RATE:
+       case Film::CONTAINER:
+               setup_description ();
+               setup_sensitivity ();
+               break;
        case Film::RESOLUTION:
                setup_description ();
                break;
        case Film::REEL_TYPE:
        case Film::INTEROP:
                setup_sensitivity ();
+               break;
        default:
                break;
        }
@@ -457,9 +470,9 @@ 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);
+       setup_refer_button (_reference, _reference_note, dcp, can_reference, why_not);
 
        if (_reference->GetValue ()) {
                _frame_type->wrapped()->Enable (false);