X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.cc;h=9c044e1889f51109517276899ef7350135a9aa26;hb=a8e31120a793f09ab56cc2847d76944ba698ba95;hp=fcd7af30a34b56ce004f1a54bbda05f36797effe;hpb=38b811d794ca2c3aec5b80e6e23532d4cb4d4a15;p=dcpomatic.git diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index fcd7af30a..9c044e188 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -24,6 +24,9 @@ #include "content_colour_conversion_dialog.h" #include "content_widget.h" #include "content_panel.h" +#include "static_text.h" +#include "check_box.h" +#include "dcpomatic_button.h" #include "lib/filter.h" #include "lib/ffmpeg_content.h" #include "lib/colour_conversion.h" @@ -48,6 +51,7 @@ using boost::shared_ptr; using boost::dynamic_pointer_cast; using boost::bind; using boost::optional; +using namespace dcpomatic; static VideoContentScale index_to_scale (int n) @@ -74,16 +78,15 @@ scale_to_index (VideoContentScale scale) VideoPanel::VideoPanel (ContentPanel* p) : ContentSubPanel (p, _("Video")) { - 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; + _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); + font.SetPointSize(font.GetPointSize() - 1); + _reference_note->SetFont(font); - add_label_to_sizer (grid, this, _("Type"), true, wxGBPosition (r, 0)); + _type_label = create_label (this, _("Type"), true); _frame_type = new ContentChoice ( this, new wxChoice (this, wxID_ANY), @@ -94,15 +97,8 @@ VideoPanel::VideoPanel (ContentPanel* p) &caster, &caster ); - _frame_type->add (grid, wxGBPosition (r, 1), wxGBSpan (1, 2)); - ++r; - - add_label_to_sizer (grid, this, _("Crop"), true, wxGBPosition (r, 0)); - - int cr = 0; - wxGridBagSizer* crop = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); - add_label_to_sizer (crop, this, _("Left"), true, wxGBPosition (cr, 0)); + _left_crop_label = create_label (this, _("Left crop"), true); _left_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), @@ -111,9 +107,8 @@ VideoPanel::VideoPanel (ContentPanel* p) boost::mem_fn (&VideoContent::left_crop), boost::mem_fn (&VideoContent::set_left_crop) ); - _left_crop->add (crop, wxGBPosition (cr, 1)); - add_label_to_sizer (crop, this, _("Right"), true, wxGBPosition (cr, 2)); + _right_crop_label = create_label (this, _("Right crop"), true); _right_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), @@ -122,11 +117,8 @@ VideoPanel::VideoPanel (ContentPanel* p) boost::mem_fn (&VideoContent::right_crop), boost::mem_fn (&VideoContent::set_right_crop) ); - _right_crop->add (crop, wxGBPosition (cr, 3)); - ++cr; - - add_label_to_sizer (crop, this, _("Top"), true, wxGBPosition (cr, 0)); + _top_crop_label = create_label (this, _("Top crop"), true); _top_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), @@ -135,9 +127,8 @@ VideoPanel::VideoPanel (ContentPanel* p) boost::mem_fn (&VideoContent::top_crop), boost::mem_fn (&VideoContent::set_top_crop) ); - _top_crop->add (crop, wxGBPosition (cr, 1)); - add_label_to_sizer (crop, this, _("Bottom"), true, wxGBPosition (cr, 2)); + _bottom_crop_label = create_label (this, _("Bottom crop"), true); _bottom_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), @@ -146,22 +137,14 @@ VideoPanel::VideoPanel (ContentPanel* p) boost::mem_fn (&VideoContent::bottom_crop), boost::mem_fn (&VideoContent::set_bottom_crop) ); - _bottom_crop->add (crop, wxGBPosition (cr, 3)); - - grid->Add (crop, wxGBPosition (r, 1), wxGBSpan (2, 3)); - r += 2; - add_label_to_sizer (grid, this, _("Fade in"), true, wxGBPosition (r, 0)); + _fade_in_label = create_label (this, _("Fade in"), true); _fade_in = new Timecode (this); - grid->Add (_fade_in, wxGBPosition (r, 1), wxGBSpan (1, 3)); - ++r; - add_label_to_sizer (grid, this, _("Fade out"), true, wxGBPosition (r, 0)); + _fade_out_label = create_label (this, _("Fade out"), true); _fade_out = new Timecode (this); - grid->Add (_fade_out, wxGBPosition (r, 1), wxGBSpan (1, 3)); - ++r; - add_label_to_sizer (grid, this, _("Scale to"), true, wxGBPosition (r, 0)); + _scale_to_label = create_label (this, _("Scale to"), true); _scale = new ContentChoice ( this, new wxChoice (this, wxID_ANY), @@ -172,59 +155,33 @@ VideoPanel::VideoPanel (ContentPanel* p) &index_to_scale, &scale_to_index ); - _scale->add (grid, wxGBPosition (r, 1), wxGBSpan (1, 2)); - ++r; wxClientDC dc (this); wxSize size = dc.GetTextExtent (wxT ("A quite long name")); size.SetHeight (-1); - add_label_to_sizer (grid, this, _("Filters"), true, wxGBPosition (r, 0)); - { - wxSizer* s = new wxBoxSizer (wxHORIZONTAL); - - _filters = new wxStaticText (this, wxID_ANY, _("None"), wxDefaultPosition, size); - 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); + _filters_label = create_label (this, _("Filters"), true); + _filters = new StaticText (this, _("None"), wxDefaultPosition, size); + _filters_button = new Button (this, _("Edit...")); - grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + _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()) { + _colour_conversion->Append (std_to_wx (i.name)); } - ++r; - - add_label_to_sizer (grid, this, _("Colour conversion"), true, wxGBPosition (r, 0)); - { - wxSizer* s = new wxBoxSizer (wxHORIZONTAL); - - _colour_conversion = new wxChoice (this, wxID_ANY, wxDefaultPosition, size); - _colour_conversion->Append (_("None")); - BOOST_FOREACH (PresetColourConversion 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")); - s->Add (_colour_conversion, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6); + /// TRANSLATORS: translate the word "Custom" here; do not include the "Colour|" prefix + _colour_conversion->Append (S_("Colour|Custom")); + _edit_colour_conversion_button = new Button (this, _("Edit...")); - _edit_colour_conversion_button = new wxButton (this, wxID_ANY, _("Edit...")); - s->Add (_edit_colour_conversion_button, 0, wxALIGN_CENTER_VERTICAL); - - grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); - } - ++r; - - _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 = new StaticText (this, wxT ("\n \n \n \n \n"), wxDefaultPosition, wxDefaultSize); _description->SetFont(font); - ++r; - _left_crop->wrapped()->SetRange (0, 1024); - _top_crop->wrapped()->SetRange (0, 1024); - _right_crop->wrapped()->SetRange (0, 1024); - _bottom_crop->wrapped()->SetRange (0, 1024); + _left_crop->wrapped()->SetRange (0, 4096); + _top_crop->wrapped()->SetRange (0, 4096); + _right_crop->wrapped()->SetRange (0, 4096); + _bottom_crop->wrapped()->SetRange (0, 4096); _scale->wrapped()->Clear (); BOOST_FOREACH (VideoContentScale const & i, VideoContentScale::all ()) { @@ -239,26 +196,110 @@ VideoPanel::VideoPanel (ContentPanel* p) _frame_type->wrapped()->Append (_("3D left only")); _frame_type->wrapped()->Append (_("3D right only")); + content_selection_changed (); + _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_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)); + _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)); + + add_to_grid (); } +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; + } + + add_label_to_sizer (_grid, _type_label, true, wxGBPosition(r, 0)); + _frame_type->add (_grid, wxGBPosition(r, 1), wxGBSpan(1, 2)); + ++r; + + 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)); + ++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; + + _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); + + 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; + + if (full) { + 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; + } + + _grid->Add (_description, wxGBPosition (r, 0), wxGBSpan (1, 4), wxEXPAND | wxALIGN_CENTER_VERTICAL, 6); + ++r; +} + + void VideoPanel::film_changed (Film::Property property) { switch (property) { case Film::VIDEO_FRAME_RATE: case Film::CONTAINER: - setup_description (); - setup_sensitivity (); - break; case Film::RESOLUTION: setup_description (); + setup_sensitivity (); break; case Film::REEL_TYPE: case Film::INTEROP: @@ -320,8 +361,8 @@ VideoPanel::film_content_changed (int property) if (check.size() == 1) { _fade_in->set ( - ContentTime::from_frames (vc.front()->video->fade_in (), vc.front()->active_video_frame_rate ()), - vc.front()->active_video_frame_rate () + ContentTime::from_frames (vc.front()->video->fade_in(), vc.front()->active_video_frame_rate(_parent->film())), + vc.front()->active_video_frame_rate(_parent->film()) ); } else { _fade_in->clear (); @@ -334,8 +375,8 @@ VideoPanel::film_content_changed (int property) if (check.size() == 1) { _fade_out->set ( - ContentTime::from_frames (vc.front()->video->fade_out (), vc.front()->active_video_frame_rate ()), - vc.front()->active_video_frame_rate () + ContentTime::from_frames (vc.front()->video->fade_out(), vc.front()->active_video_frame_rate(_parent->film())), + vc.front()->active_video_frame_rate(_parent->film()) ); } else { _fade_out->clear (); @@ -379,7 +420,7 @@ VideoPanel::setup_description () return; } - string d = vc.front()->video->processing_description (); + string d = vc.front()->video->processing_description (_parent->film()); size_t lines = count (d.begin(), d.end(), '\n'); for (int i = lines; i < 6; ++i) { @@ -462,9 +503,9 @@ VideoPanel::setup_sensitivity () dcp = dynamic_pointer_cast (sel.front ()); } - list why_not; - bool const can_reference = dcp && dcp->can_reference_video (why_not); - setup_refer_button (_reference, dcp, can_reference, why_not); + 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); if (_reference->GetValue ()) { _frame_type->wrapped()->Enable (false);